98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
53a7b2e72c
more double quotes to single quotes and fix some spacing
2017-05-31 09:57:55 -04:00
82a13fac76
new class for Monitors
2017-05-30 21:21:51 -04:00
32d1e62f73
braces, spacing, quotes
2017-05-30 21:18:13 -04:00
885823aeb6
remove unnecessary quotes and convert double quotes to single quotes
2017-05-30 21:11:51 -04:00
1d5248c0b8
merge from SA, but remove Storageareas bits
2017-05-30 20:06:29 -04:00
dcf7c7f015
put back requires
2017-05-30 19:52:19 -04:00
ab85239d82
fix braces, invert control directions when camera is flipped
2017-05-30 19:49:30 -04:00
0bb2bed32c
remove blank lines, do some better escaping
2017-05-30 19:47:35 -04:00
cca2c624f9
fix spelling mistake
2017-05-30 19:42:38 -04:00
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
3c9d8f4ec6
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
2017-05-30 09:44:43 -04:00
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
0c25cecb93
Fix some spacing
2017-05-26 13:36:20 -04:00
368567335b
remove some quotes
2017-05-26 13:33:34 -04:00
a2bf5df2d4
remove some quotes
2017-05-26 13:27:55 -04:00
2a2d667afb
remove some quotes
2017-05-26 13:27:06 -04:00
34f4abb549
Merge branch 'master' into storageareas
2017-05-26 13:17:51 -04:00
ed12dab648
fixup docs, cleanup
2017-05-26 13:13:34 -04:00
cc83582a90
put back AutoMessage and AutoVideo logic
2017-05-26 13:04:08 -04:00
8fde33ee1b
remove StorageAreas stuff
2017-05-26 12:30:20 -04:00
5f1b084cc5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:27:07 -04:00
dbf83831ff
merge from SA. Adds the ability to pass in additional options when connecting
2017-05-20 10:32:41 -04:00
d76d65f475
merge from SA, includes StorageAreas support
2017-05-20 10:32:04 -04:00
7970b806e0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-20 07:57:03 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00
65b4a7ccdb
merge simple debug output changes from storageareas
2017-05-15 16:40:46 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
e5c38be716
Cleanup, when the monitor is flipped horizontally, reverse the commands
2017-05-04 12:27:30 -04:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
65f96df477
Merge pull request #1791 from dwalkes/FI8908ControlAdd
...
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
7f4fb64495
blah
2017-04-07 13:38:41 -04:00
94ddfc4053
Fix
2017-04-07 11:58:27 -04:00
c4ec2d7fab
Suppress debug messages on ZM service start/restart
...
The tests in the script General.pm that determine the format for superuser calls on the target environment may leak debug messages to STDOUT. This can be replicated on a Docker installation of Zoneminder lacking sudo. Starting the Zoneminder process will display an intimidating series of error messages that can safely be ignored by the user:
e.g.
'''
root@2bfdd23cc27a:~# service zoneminder start
Starting ZoneMinder: Can't exec "sudo": No such file or directory at /usr/share/perl5/ZoneMinder/General.pm line 1 10.
Use of uninitialized value $output in scalar chomp at /usr/share/perl5/ZoneMinder/General.pm line 119.
Use of uninitialized value $output in concatenation (.) or string at /usr/share/perl5/ZoneMinder/General.pm line 1 20.
success
'''
This patch redirects STDERR from the qx(...) calls to the debug message., And if the output of qx(...) is undefined, replaces it with any error in $! resulting from the qx(...) call.
2017-04-05 17:26:19 -07:00
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
8bb9ba7bea
Add more debugging
2017-03-29 09:59:58 -04:00
a6261b5497
allow filters to act on unfinished events.
2017-03-29 09:39:20 -04:00
3cd9e46df9
Merge branch 'knnniggett-csrf' into storageareas
2017-03-28 20:44:38 -04:00
d006ebfc3c
Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf
2017-03-28 20:10:59 -04:00
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05:00
eba6cec7a1
Merge branch 'master' into storageareas
2017-03-20 12:01:20 -04:00
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
aa1aeeeca4
Additional controls for FI8908W cameras
...
Mobile application ZM View uses relative move commands and presetGoto
commands which were not supported by the previous version of the script.
Add these commands based on documentation in
http://www.foscam.es/descarga/ipcam_cgi_sdk.pdf
Commands were tested on an FI8908W camera running version 11.37.2.65
firmware
2017-02-18 17:14:59 -07:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
c79dfb6a16
fix typos
2017-01-15 10:56:57 -05:00
4973d8c74c
add support for connect options
2017-01-15 10:54:46 -05:00
ac32b001e9
use a real variable for the file handle so that it sticks around.
2017-01-12 13:05:39 -05:00
c97ecc2a38
remove debug line
2017-01-12 13:04:44 -05:00
513cd68c20
remove the verified caching. It makes calling zmMemVerify useless.
2017-01-12 13:02:16 -05:00
ed5c3c4ed4
remove debug stautement
2017-01-12 12:58:09 -05:00
e94a797a5e
remove debug stautement
2017-01-12 12:56:20 -05:00
0197c550ae
Use a real variable for file handle so that it sticks around
2017-01-12 12:54:14 -05:00
0f67d9847e
remove caching of verified status of an mmap.
2017-01-12 12:53:57 -05:00
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
a146d7bee1
add a test for valid in the shared data. zmc sets this to false when it closes properly
2017-01-10 15:08:49 -05:00
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
99e823ef33
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-08 11:04:59 -05:00
146a772a21
move ENDPOINT to hidden category
2017-01-06 19:49:03 -05:00
426eabb12d
if running from a terminal, set termLevel to info
2017-01-05 11:24:53 -05:00
db1a6f9b3b
fix to remove qqq
2017-01-05 11:24:27 -05:00
75cd1de7ab
show the # of entries loaded and saved
2017-01-05 09:42:11 -05:00
0c34aa9830
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-04 12:25:01 -05:00
cf9747054c
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
2017-01-04 12:22:01 -05:00
2a1ec2beb1
Merge pull request #1719 from knnniggett/hikvisionptz
...
Add HikVision ptz control sciprt
2017-01-03 08:59:56 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
0f15b3ae62
update gpl 2 mailing address
2016-12-26 10:33:03 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
1bf93d76b7
fix www and parenthesis.
2016-12-13 14:56:29 -05:00
6ceb4cc93e
fix qqq and replace doube quotes with single quotes
2016-12-13 14:32:28 -05:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
2c0a868eea
fix typo
2016-12-08 11:02:59 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
ecbaaef59a
Merge pull request #1670 from connortechnology/fix_braces
...
Fix braces
2016-12-06 08:39:43 -06:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
911256785e
Merge branch 'fix_braces' into storageareas
2016-11-08 13:14:12 -05:00
1be6c57aee
fix extra semi colon
2016-11-08 13:11:10 -05:00
5f0c1c0e26
fix layout in a complex map
2016-11-08 12:55:07 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
eb2177e76a
whitespace fixes in prep for merging master
2016-11-08 10:44:00 -05:00
4be668f838
Add HikVision ptz control sciprt
2016-11-06 08:03:43 -06:00
0dbde8e290
correct a lot of braces
2016-11-04 15:53:14 -04:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
93725b3f4b
fixup spacing in ConfigData
2016-11-04 14:05:51 -04:00
3d17067276
change tabs to spaces
2016-11-03 14:30:23 -04:00
68c8178648
remove some extra spaces
2016-11-03 14:21:07 -04:00
bb371612c3
tabs to spaces
2016-11-03 14:18:03 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
191efed8e3
change fast_delete to off - fixes #1597
2016-10-19 14:10:28 -05:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
10e451faa6
fix log line
2016-10-02 12:23:19 -04:00
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
e6b1cf90df
Merge pull request #1566 from gerdesj/Keekoon
...
Control script for Keekoon cameras.
2016-08-06 09:09:40 -05:00
ee720c4561
Control script for Keekoon cameras. Tested with KK002.
2016-07-25 11:20:49 +01:00
aed3c3d29a
reduce noise on "zmupdate.pl" invocation
2016-07-14 00:43:32 +10:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
1069b301a0
functions have been moved from ConfigAdmin to Config
2016-06-12 15:38:59 -04:00
2da709848a
remove extra comma screwing up the sql
2016-05-30 09:30:02 -04:00
408646ea4d
remove extra s
2016-05-27 10:52:59 -04:00
1983f106f4
Add a missing sth->finish
2016-05-27 09:01:01 -04:00
b0116f25e9
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
2016-05-27 08:59:46 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
795665f8c7
Merge branch 'startup_time' into storageareas
2016-09-29 11:07:55 -04:00
29c015ecd3
need to put zmGetStartupTime in exports
2016-09-29 11:07:33 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
b074a3257d
add StartTime to log line about deleting an event.
2016-09-28 08:35:19 -04:00
a3e99cf08d
quick update to Monitor to use Object methods
2016-09-20 12:15:48 -04:00
e228de6ebe
detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path
2016-09-19 16:44:43 -04:00
8f33ed6ca6
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
2016-09-15 11:16:05 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
99289e4713
Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better.
2016-08-04 12:22:33 -04:00
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -04:00
1e2ec7028e
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
2016-07-12 14:16:20 -04:00
26369268bb
merge Steve's updates, work on zmaudit
2016-07-12 11:27:25 -04:00
76cb031a5e
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-06-12 07:14:30 -04:00
2460bccdac
fix missing $
2016-06-06 10:18:21 -04:00
ef9c0ca33a
Debug the SQL on execute, not on parse
2016-06-03 11:15:40 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
8a14d6f4d2
Don't not load the event if it was videod before
2016-05-30 14:57:46 -04:00
4469f909fa
Add support for DefaultVideo to video generation
2016-05-30 14:07:40 -04:00
07878e3e13
Put back the code that makes getDiskPercent look in the storagearea
2016-05-30 10:43:51 -04:00
886d88b184
Merge branch 'improve_filter' into storageareas
2016-05-30 09:30:18 -04:00
63ac75b440
use ::Database::dbh instead of 3013self{dbh}
2016-05-30 09:27:36 -04:00
2663781adc
put back missing my =__git_main[0];
2016-05-30 09:13:39 -04:00
7bc95561ad
fix
2016-05-29 11:37:32 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
419e67caa1
Put back the code that populates ZM_SERVER_ID
2016-05-26 12:42:22 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
a0af99459a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-25 10:12:22 -04:00
aedba1bc7f
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
2016-05-24 16:49:04 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
57a25373fa
Add logic to Config.pm
2016-05-22 08:53:30 -07:00
a3fe6ea181
Apply changes to Logger.pm
2016-05-22 08:28:23 -07:00
38e1cc909c
Reapply changes to Database.pm
2016-05-22 08:19:18 -07:00
1e52934dcf
Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem
2016-05-20 20:33:47 -04:00
bb5dbf3e4a
Need to import Config Data into Config
2016-05-20 09:29:40 -04:00
182fa9a5cd
revert the bulk of the merge_db_connects changes.
2016-05-20 08:53:53 -04:00
46039a1887
Merge pull request #1472 from ZoneMinder/v4l1_compat
...
V4l1 compat
2016-05-16 13:02:27 -05:00
3780f8a2e6
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
2016-05-16 09:31:54 -04:00
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
aaa4b3a824
check for db connection before assuming that dbh is valid
2016-05-10 11:11:45 -04:00
a5ba4759bf
fix new config entry
2016-05-10 10:54:40 -04:00
17f4f5789e
Merge branch 'master' into v4l1_compat
2016-05-10 10:10:48 -04:00
a012320a3e
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
2016-05-10 09:06:49 -04:00
07e988266a
Merge branch 'merge_db_connects' into storageareas
2016-05-09 13:28:40 -04:00
9d9f2453c3
deprecate ConfigAdmin, merge it into Config.pm
2016-05-09 13:27:22 -04:00
cd8c9703c0
remove extra q
2016-05-09 12:48:56 -04:00
2fec880ff6
fix help/description mixup
2016-05-09 12:48:35 -04:00
5806eb0958
Merge branch 'v4l1_compat' into storageareas
2016-05-09 12:46:34 -04:00
08bf97fe85
Add a config entry for ZM_LD_PRELOAD
2016-05-09 12:44:41 -04:00
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
b33e35bda7
move the require to the top
2016-05-09 12:14:59 -04:00
3522c5796b
add BEGIN Back to ZoneMinder.pm
2016-05-09 12:01:26 -04:00
e064af4214
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:35:14 -04:00
b444c8a6b4
Move the BEGIN from ZoneMinder to ZoneMinder/Base.
2016-05-07 09:34:45 -04:00
6e32b5d266
Use fully specified COnfig hash to simplify Symbol tables
2016-05-07 09:34:04 -04:00
1d63062188
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:30:18 -04:00
f55f979cc9
use fully specified Config to simplify symbol tables
2016-05-07 09:30:03 -04:00
18442be77f
Merge branch 'merge_db_connects' into storageareas
2016-05-03 14:09:18 -04:00
e3d581dcab
use single quotes instead of double quotes
2016-05-03 10:23:09 -04:00
24bf91707f
Database module should really use DBI
2016-05-03 10:22:38 -04:00
e80db4c433
Use zmDbConnect instead of duplicated db connect code
2016-05-03 10:22:16 -04:00
49e3d3be7a
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
2016-05-03 10:21:50 -04:00
9406a2337f
Add a BEGIN section to load things in the correct order.
2016-05-03 10:21:01 -04:00
2ba18e14fc
Merge branch 'merge_db_connects' into storageareas
2016-05-03 09:05:36 -04:00
30f34a6f49
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:59:40 -04:00
55d58a140e
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:57:51 -04:00
408fba8d24
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-30 10:09:52 -04:00
6bf43631e2
Merge pull request #1428 from ZoneMinder/better_zmvideo
...
Better zmvideo
2016-04-28 22:00:52 +10:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
1072327dd1
remove extra quote
2016-04-21 08:01:13 -05:00
3a9ab7f685
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
2016-04-21 07:27:19 -05:00
67f38d07df
Merge branch 'master' into better_zmvideo
2016-04-20 12:04:15 -04:00
a2d92300b3
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-11 21:51:41 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
dd7f399959
Merge branch 'remove_local_zm_conf_override' into storageareas
2016-04-04 16:13:44 -04:00
a31660c1f6
Remove the code looks for zm.conf in the current dir.
2016-04-04 10:45:58 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
38e3c92546
Minor grammar fixes
2016-03-25 13:18:43 +00:00
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
4e1af516d7
Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful.
2016-03-11 14:29:48 -07:00
facae6cb0d
use make "-f" parameter instead of "--makefile"
2016-03-10 13:58:41 -06:00
0d8c63f578
Merge branch 'master' into storageareas
2016-03-02 09:11:55 -05:00
bc89b95470
Merge pull request #1292 from ZoneMinder/telemetry
...
Telemetry Data
2016-03-01 07:17:16 -07:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
6b169af655
Remove eyezm configdata
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2016-02-26 22:35:24 +11:00
86c223668d
Merge branch 'master' into storageareas
2016-02-25 19:11:38 -05:00
7a42a8c3f9
add Netcat ONVIF compatible ptz control
2016-02-24 10:15:59 -06:00
66e76e4c2e
Merge branch 'zm_trigger_improvements' into storageareas
2016-02-19 11:09:41 -05:00
64c5b64068
Log error before croaking and include port# in the error message
2016-02-19 11:04:02 -05:00
327a01cb20
Log error before croaking and show path to file in the error message
2016-02-19 10:59:40 -05:00
3a512f87a5
Log the reason for croaking before croaking.
2016-02-19 10:57:52 -05:00
ee3f87a2ad
additional refinements to zmtelemetry
2016-02-13 14:53:22 -06:00
0ff0262c8b
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 19:12:12 -05:00
18c493a180
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
2016-02-10 13:04:14 -06:00
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
b718bd298f
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
2016-02-09 06:56:38 -06:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
8a537029ea
Initial commit to add zmtelemetry.pl
2016-02-06 14:08:28 -06:00
1837cc89ea
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
version
2016-02-04 12:24:07 -05:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
d65c9d797b
fix merge, update to 1.30.1
2016-02-04 12:13:48 -05:00
9ace6c518d
Merge pull request #1225 from Simpler1/profiles
...
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
52e16dbdd0
Merge pull request #1249 from knnniggett/pelcop
...
Fix PelcoP checksum calculation
2016-02-04 11:52:51 -05:00
748754a213
Merge pull request #1209 from adamreiser/StrictKeyChecking
...
Strict key checking
2016-02-04 10:07:19 -06:00
11b206e281
fix getPath -> Path
2016-02-01 12:52:14 -05:00
ff46344175
Use Storage Areas in geteventPath
2016-02-01 12:51:43 -05:00
fa168027b3
Fix PelcoP checksum calculation
2016-01-24 07:45:04 -06:00
50b113cd02
Merge pull request #1189 from marcolino7/master
...
PTZ - Added autostop to Down command on FI8918W
2016-01-24 07:40:30 -06:00
7700623b16
Move SQL debug to Execute
2016-01-13 09:02:37 -05:00
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
a6c3d05071
Debug return events and the sql used
2016-01-04 16:01:07 -05:00
17adc2b4e5
Rough in a Monitor class
2016-01-04 15:27:42 -05:00
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
659b3f37f5
Stylistic fix
2015-12-29 21:08:24 -08:00
28bf4dfe7b
Add option for strict host key checking
2015-12-29 16:34:11 -08:00
d943488475
add sub Storage
2015-12-24 15:32:30 -05:00
177ed076a7
Make zmaudit only look at storage areas that are local
2015-12-24 15:25:56 -05:00
dfa9a5a390
Add AUTOLOAD
2015-12-23 14:31:56 -05:00
1328492c64
fixes
2015-12-23 14:16:09 -05:00
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
9c6041d55b
require Object
2015-12-22 13:13:45 -05:00
3932ce692c
remove Exporter stuff
2015-12-22 12:55:36 -05:00
171fcf0dca
Use Object
2015-12-22 12:40:15 -05:00
26a92e5fed
require Object
2015-12-22 12:23:24 -05:00
7663955dc8
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-22 12:14:29 -05:00
e2f8b1adc3
rough in generic object, using some similar syntax to dbix
2015-12-22 12:13:57 -05:00
c9dc53b237
add in find and find_one
2015-12-22 11:50:08 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
12d87c252f
Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something
2015-12-21 16:04:31 -05:00
239b494db8
Add M.Id as MonitorID
2015-12-21 15:31:33 -05:00
07260adb2a
append ZoneMinder::General to executeShellCommand
2015-12-21 15:30:05 -05:00
a4024ffebc
Must do E.*, not *
2015-12-21 15:29:27 -05:00
9d454bdc41
Add test for empty storage path
2015-12-21 15:29:18 -05:00
3e29aa56a3
Return default event path when no Id in Storage
2015-12-21 15:27:53 -05:00
16a1768511
fixes
2015-12-21 15:19:57 -05:00
ad038edab4
chdir
2015-12-21 14:49:00 -05:00
99f9145cdd
Fix SQL for loading events
2015-12-21 14:43:55 -05:00
892623ce63
Use * to grab all Event columns
2015-12-21 14:14:00 -05:00
0cb2d141a5
Fix dbh's
2015-12-21 13:16:07 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
5683210e42
Add missing ;
2015-12-21 12:42:00 -05:00
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
2dfab0b408
Add delete and delete_files methods
2015-12-21 12:29:35 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
c2a857b498
Merge branch 'storageareas' into newpointone
2015-12-21 11:34:27 -05:00
3d00c3a50d
Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent
2015-12-21 11:34:12 -05:00
710197a4f2
Merge branch 'filter_object' into storageareas
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
scripts/zmfilter.pl.in
2015-12-21 11:27:48 -05:00
de83872671
id => Id
2015-12-21 11:25:38 -05:00
118dc12ad5
id => Id
2015-12-21 11:25:17 -05:00
f6d52e77b9
it is important to return the object from the constructor
2015-12-21 11:13:21 -05:00
9f02f4353c
it is important to return the object from the constructor
2015-12-21 11:13:01 -05:00
e7c337f9f3
fix namespace for dbh
2015-12-21 11:10:45 -05:00
ac88867fd2
fix namespace for dbh
2015-12-21 11:10:24 -05:00
8682b1af28
rough in a Storage class for the perl side of things
2015-12-21 11:03:53 -05:00
30353fbcf9
Add special case for Server Attr's because they are on the Monitor, not the event
2015-12-21 10:33:19 -05:00
5553760222
Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on.
2015-12-21 10:23:37 -05:00
27b1b37d5b
added opt_use_api
2015-12-19 17:43:36 -05:00
fd773858a6
Merge branch 'better_zmvideo' into newpointone
...
Conflicts:
scripts/zmfilter.pl.in
2015-12-18 14:17:45 -05:00
d035753971
Add the event class.
...
Also, remove the unused Storage class
2015-12-17 14:38:18 -05:00
c71d1e52ac
Fix
2015-12-17 13:13:04 -05:00
9db9d243f2
Fix
2015-12-17 13:12:37 -05:00
6f34022613
add find and find_one routines
2015-12-17 13:11:32 -05:00
7365c053e6
Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl.
2015-12-17 12:56:40 -05:00
3121e5550c
Create a new class Storage and use it to handle figureing out where the event is actually stored.
2015-12-17 10:47:47 -05:00
62095b30d0
Added autostop to Down command
2015-12-16 16:58:20 +01:00
39e396eb6e
Merge branch 'master' into multi-server
2015-12-09 10:36:51 -05:00
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -05:00
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
35617a6cf7
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
2015-11-02 22:16:10 -05:00
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00:00
4eb4bdbfb5
Added control script for SunEyes SP-P1802SWPTZ
...
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6 )
2015-09-30 13:39:50 +02:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
cf3f160783
add error handling on failure to open serial port
2015-07-15 16:02:02 -04:00
4630bad24b
add http to control url if it isn't present
2015-07-15 15:59:21 -04:00
f8cc27e224
Protocol for 8918W
2015-06-19 15:45:50 -04:00
991291ce67
declared so perl does not complain of globals
2015-06-19 14:12:08 -04:00
39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
950cd06535
Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting""
...
This reverts commit 9c73b7247c
2015-05-13 11:38:55 -04:00
9c73b7247c
Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"
...
This reverts commit a5fed03524
2015-05-13 11:37:13 -04:00
a5fed03524
Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting
2015-05-13 11:33:22 -04:00
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
e8114c90bb
Fix printMsg. We don't use it as an object method. Update to parse a user:password out of ControlAddress which is what a lot of other scripts do.
2015-05-12 17:08:55 -04:00
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
458ed9ede9
ZoneMinder.pm: minor re-wrapping
2015-04-19 18:15:23 +10:00
62c1429039
wrap long lines
2015-04-19 16:31:53 +10:00
6a150d2607
tabs-to-spaces
2015-04-19 15:17:10 +10:00
85d75b0b27
Logger.pm: define '$LOGFILE'
...
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
59b63188cb
eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5)
2015-04-17 09:33:06 +10:00
3d512dbada
eliminate Subroutine prototypes
2015-04-17 09:22:47 +10:00
f02b9c94ec
PelcoP.pm: correct package declaration (thanks, perlcritic)
...
Package declaration must match filename at line 25, column 1. Correct the filename or package statement. (Severity: 5)
2015-04-17 08:24:01 +10:00
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
e6631ebaf1
Propagate new perl changes to the ONVIF perl modules
2015-04-09 20:11:32 -05:00
a2d9c0c042
Don't copy .in files into staging
2015-04-08 12:22:46 -05:00
e895fd26f7
cmake - use perl INSTALLDIRS
2015-04-07 08:19:21 -05:00
904f2989ed
Improving ZM_USE_DEEP_STORAGE description ( #783 ):
...
Removed "If you are upgrading from a previous version of ZoneMinder" from
description. From data loss prospective it is irrelevant whether database
is upgraded or not as fresh install is just as vulnerable.
Changed "enable" to "change" to emphasize the above.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:39:13 +10:00
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
b0faa138bd
POD: added missing NAME sections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
11f7af3b03
fixing POD errors
...
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 14:41:01 +11:00
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
a52f07fa8e
Some cleanups, remove code that does nothing.
...
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
2014-12-08 15:54:27 -05:00
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
2014-10-21 15:17:34 -04:00
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
9c8419f89a
detaint to keep perl from complaining
2014-10-10 09:03:30 -05:00
19482851ff
New method to determine bitness
2014-10-10 08:10:03 -05:00
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
60ed8d7366
Update ConfigData.pm.in
...
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
2014-09-12 08:05:15 -05:00
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04:00
7cbb079370
revert size check for now
2014-08-04 11:26:33 -04:00
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
a87f75eee0
any size discrepancy is caused for bailing
2014-08-01 11:27:51 -04:00
fa67e21c07
Update FI9821W_Y2k.pm
...
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
2014-07-22 19:06:04 +02:00
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
15f014eb8b
Changes from nagyrobi:
...
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.
Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
2014-02-26 09:00:10 -06:00
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
5ccfa305d3
Merge pull request #294 from knnniggett/glob_ptz_scripts
...
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
0eac723409
glob ptz scripts under control folder
2014-01-01 12:17:13 -06:00
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
3fb76eaf35
Initial version of control file for Foscam IP cameras.
...
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
2013-12-29 22:24:35 +01:00
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00
2ced76c20d
do this one too
2013-12-17 11:24:33 -05:00
8777295468
use fully specified version
2013-12-17 11:23:03 -05:00
1d338ed879
more
2013-12-16 16:36:12 -05:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
8c0ad352f5
Fix shared memory errors on centos 6.4
2013-11-08 14:53:01 -05:00
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
1d0e721ba2
Attempt to get the perl modules to be fully out of source during an out-of-source build
2013-11-03 00:20:49 +02:00
d428c832e7
blah
2013-11-01 09:50:50 -04:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
36f525efae
Correctly hard code man dir path into cmake this time hopefully
2013-10-29 12:43:28 +02:00
604b7f4ccc
Clean files generated by MakeMaker when running cmake's make clean target
2013-10-29 11:21:23 +02:00
23ec8266d9
Hard code man dir path into cmake to fix issues with some distros
2013-10-29 11:02:47 +02:00
0143969498
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
2013-10-29 10:01:29 +02:00
b558d42cdc
Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers
2013-10-09 15:41:14 +03:00
ba727a5611
Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding
2013-10-07 16:57:26 +03:00
1609fd688b
Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images
2013-10-07 16:54:13 +03:00
d0cbb3f498
remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target
2013-10-05 14:29:12 -05:00
3dbef94b04
Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt
2013-10-04 22:50:50 +03:00
5607f2823f
Fixed missing perl5 in path in the last commit
2013-10-04 22:40:09 +03:00
9c3540a952
Attempt to fix issues with perl paths that andy is experiencing
2013-10-04 22:35:16 +03:00
60258e7aa1
Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS.
2013-10-04 11:54:21 -04:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
79b45bec68
Avoid trouble with whitespaces in current directory path
2013-10-03 15:37:46 +03:00
883e676e29
Fixed path issues when creating packages (rpms and such)
2013-10-03 15:35:10 +03:00
f043c6e955
Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements
2013-10-03 15:08:09 +03:00
5fce4c516b
Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5
2013-10-01 17:38:51 +03:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
caa73f608b
Merge remote-tracking branch 'origin/develop'
2013-09-09 16:44:58 +03:00
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
4cc878e930
Merge branch 'release-1.26' into develop
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
d458c145a3
Add Brian Rudy's script to control SkyIPCam cameras.
2013-04-29 12:04:12 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
0932f50d80
1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
...
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +02:00
60a042e44b
Fixed an error in zmMemWrite(), breaking shared memory writes from perl, which prevented zmtrigger.pl (and perhaps others) from working.
2012-03-12 19:52:53 +02:00
de2df49d64
1) Added support for the new formats to the mpeg code.
...
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
4a59761bcc
Getting closer and closer everyday.
...
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
13e46d8595
Improved makePath and tweaks to createEvent
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3522 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-11 10:08:49 +00:00
dacb1f2a27
Added event creation functions for scripted events, not entirely complete.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3521 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:56:21 +00:00
1e80d72ddd
Fixed line endings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3507 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:10:22 +00:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
a3ba83aca4
Typo
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3498 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 08:46:59 +00:00
6df4a71336
Fixed event paths when using absolute paths.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3490 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:31:29 +00:00
65b0213960
Minor typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3475 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-30 21:18:46 +00:00
0d2a635689
Set up auto commit and auto reconnect on Logger database connection.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3473 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-28 11:06:02 +00:00
c3510148a6
Detaint JSON before decoding.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3466 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-24 09:04:54 +00:00
60cd56569e
Fixed default initialisations
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3464 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-24 08:31:47 +00:00
8082f491db
Fixed problem with environment variable parsing and detainting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3461 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:12:47 +00:00
241cb5f84a
Fixed undefined variable issues with debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3460 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:12:18 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
e9865320e7
Prevent memory handles from leaking when polling monitors
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3360 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 08:27:46 +00:00
c4af20ecc2
Added comment about PHP graphics needing to be installed for resampling to work.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3354 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:03:14 +00:00
7d3844f39a
Trap errors in JSON encoding and decoding
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3352 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:16:26 +00:00
60b66b909a
Added basic JSON encoding and decoding functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3349 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 13:15:42 +00:00
ee5d8db0cd
Moved the runCommand function into the library plus shell detection. Should have been there anyway.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3343 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:54:37 +00:00
e0633998f9
Changed extra debug log location to the temporary directory.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3329 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:50:02 +00:00
e3f8bdb6cd
XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
88e5abaa6e
Amended comment on FAST_IMAGE_BLENDS config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3300 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:10 +00:00
e91795a619
Removed netpbm options
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:50:04 +00:00
26882df7e3
Made deep storage the default.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3271 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 09:02:19 +00:00
4178ac9731
Replaced missing :all tags
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3269 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 08:54:25 +00:00
20785810f0
Removebosus dependencies.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3250 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-24 10:57:38 +00:00
d67d19dc4f
Removed dependency on DB existing for config generation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:36 +00:00
df0d6919c9
Added v4l2 interlacing control
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:49:42 +00:00
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
Isaac Connor
Isaac Connor
Andrew Bauer
Eliot Kent Woodrich
Andy Bauer
Steve Gilvarry
Dan Walkes
Isaac Connor
Andrew Bauer
Jon Gerdes
Dmitry Smirnov
Isaac Connor
Isaac Connor
Isaac Connor
josh4trunks
Sándor Czettner
Kyle Johnson
Isaac Connor
Isaac Connor
Simpler1
Adam Reiser
arjunrc
Marco
Robin Daermann
dreaddy
Bobby Billingsley
abauer
jmcastro2014
Sune1337
Jan M. Hochstein
Florian Asche
tim
Dmitry Katsubo
Kyle Johnson
Patrick McGuire
Kfir Itzhak
Isaac Connor
Isaac Connor
nextime
stan
jaidhar