ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,257 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1220 Commits

Author SHA1 Message Date
Isaac Connor 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
Isaac Connor b9322a02e8 Merge branch 'get_rid_of_ConfigAdmin' into storageareas 2016-05-26 09:56:16 -04:00
Isaac Connor e329bacb78 remove deprecated ConfigAdmin 2016-05-26 09:51:48 -04:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Isaac Connor a0af99459a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-25 10:12:22 -04:00
Isaac Connor 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
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
Isaac Connor 3f880fad3a Merge pull request #1500 from knnniggett/zmdc_unlink 
remove one unlink, add better error reporting to the rest
 2016-05-24 14:35:39 -04:00
Andrew Bauer 0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Andrew Bauer 11701357aa remove one unlink, add better error reporting to the rest 2016-05-24 09:01:32 -05:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
josh4trunks 57a25373fa Add logic to Config.pm 2016-05-22 08:53:30 -07:00
josh4trunks a3fe6ea181 Apply changes to Logger.pm 2016-05-22 08:28:23 -07:00
josh4trunks 38e1cc909c Reapply changes to Database.pm 2016-05-22 08:19:18 -07:00
Isaac Connor 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
Andrew Bauer 8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05:00
Isaac Connor bb5dbf3e4a Need to import Config Data into Config 2016-05-20 09:29:40 -04:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00
Isaac Connor 924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00
Isaac Connor 8e06c0ec63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-19 12:08:56 -04:00
Isaac Connor 183f9c70a4 Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:45 -04:00
Isaac Connor d57690903d Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:25 -04:00
Andrew Bauer 8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Andrew Bauer 46039a1887 Merge pull request #1472 from ZoneMinder/v4l1_compat 
V4l1 compat
 2016-05-16 13:02:27 -05:00
Isaac Connor 0b00659f26 Merge branch 'update_zmupdate' into storageareas 2016-05-16 12:24:14 -04:00
Isaac Connor b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04:00
Isaac Connor 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
Isaac Connor 5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -04:00
Isaac Connor 3a0aa09c2f Force reconnect to the db after fork. 2016-05-13 09:09:49 -04:00
Isaac Connor e9d8b7925a Merge branch 'db_reconnect' into storageareas 2016-05-10 11:13:09 -04:00
Isaac Connor aaa4b3a824 check for db connection before assuming that dbh is valid 2016-05-10 11:11:45 -04:00
Isaac Connor a5ba4759bf fix new config entry 2016-05-10 10:54:40 -04:00
Isaac Connor 17f4f5789e Merge branch 'master' into v4l1_compat 2016-05-10 10:10:48 -04:00
Isaac Connor 56e0e4e3c6 Use Event->getPath instead of something wrong 2016-05-10 09:07:09 -04:00
Isaac Connor 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
Isaac Connor 07e988266a Merge branch 'merge_db_connects' into storageareas 2016-05-09 13:28:40 -04:00
Isaac Connor 1a1e009533 simplify use's, add some sth->finishes and move some lines to take properly use DBI 2016-05-09 13:28:09 -04:00
Isaac Connor 9d9f2453c3 deprecate ConfigAdmin, merge it into Config.pm 2016-05-09 13:27:22 -04:00
Isaac Connor cd8c9703c0 remove extra q 2016-05-09 12:48:56 -04:00
Isaac Connor 2fec880ff6 fix help/description mixup 2016-05-09 12:48:35 -04:00
Isaac Connor 5806eb0958 Merge branch 'v4l1_compat' into storageareas 2016-05-09 12:46:34 -04:00
Isaac Connor 605edfd6d0 add ENV{LD_PRELOAD} setting 2016-05-09 12:46:26 -04:00
Isaac Connor 08bf97fe85 Add a config entry for ZM_LD_PRELOAD 2016-05-09 12:44:41 -04:00
Isaac Connor beebe74e7b Merge branch 'merge_db_connects' into storageareas 2016-05-09 12:26:17 -04:00
Isaac Connor b33e35bda7 move the require to the top 2016-05-09 12:14:59 -04:00
Isaac Connor 3522c5796b add BEGIN Back to ZoneMinder.pm 2016-05-09 12:01:26 -04:00
Isaac Connor e064af4214 Merge branch 'merge_db_connects' into storageareas 2016-05-07 09:35:14 -04:00
Isaac Connor b444c8a6b4 Move the BEGIN from ZoneMinder to ZoneMinder/Base. 2016-05-07 09:34:45 -04:00
Isaac Connor 6e32b5d266 Use fully specified COnfig hash to simplify Symbol tables 2016-05-07 09:34:04 -04:00
Isaac Connor 1d63062188 Merge branch 'merge_db_connects' into storageareas 2016-05-07 09:30:18 -04:00
Isaac Connor f55f979cc9 use fully specified Config to simplify symbol tables 2016-05-07 09:30:03 -04:00
Isaac Connor 18442be77f Merge branch 'merge_db_connects' into storageareas 2016-05-03 14:09:18 -04:00
Isaac Connor 24bf91707f Database module should really use DBI 2016-05-03 10:22:38 -04:00
Isaac Connor e80db4c433 Use zmDbConnect instead of duplicated db connect code 2016-05-03 10:22:16 -04:00
Isaac Connor 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
Isaac Connor 9406a2337f Add a BEGIN section to load things in the correct order. 2016-05-03 10:21:01 -04:00
Isaac Connor 2ba18e14fc Merge branch 'merge_db_connects' into storageareas 2016-05-03 09:05:36 -04:00
Isaac Connor 30f34a6f49 instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:59:40 -04:00
Isaac Connor 55d58a140e instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:57:51 -04:00
Isaac Connor 408fba8d24 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-30 10:09:52 -04:00
Steve Gilvarry 6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10:00
Isaac Connor 0adbaafd98 Merge branch 'master' into storageareas 2016-04-26 13:10:37 -04:00
Andrew Bauer 1072327dd1 remove extra quote 2016-04-21 08:01:13 -05:00
Andrew Bauer 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
Isaac Connor 67f38d07df Merge branch 'master' into better_zmvideo 2016-04-20 12:04:15 -04:00
Isaac Connor 0da0896757 Merge branch 'master' into storageareas 2016-04-20 10:01:06 -04:00
Isaac Connor e52e880553 rework open event check to not use group by 2016-04-20 10:00:13 -04:00
Isaac Connor bb15915ce5 Use EventPrefix, not Prefix 2016-04-19 15:23:36 -04:00
Isaac Connor 588dbc0c3c Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead 2016-04-19 15:22:46 -04:00
Isaac Connor d9646d6ceb Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later 2016-04-19 15:19:37 -04:00
abi 7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03:00
Isaac Connor a2d92300b3 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-11 21:51:41 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor 87088d95ac change error to Warning... it is possible to not have any filters returned 2016-04-05 09:22:36 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor dd7f399959 Merge branch 'remove_local_zm_conf_override' into storageareas 2016-04-04 16:13:44 -04:00
Isaac Connor a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor 22554603b1 remove duplicate zmtelemetry.pl entry 2016-03-29 12:31:27 -04:00
Isaac Connor f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 
Conflicts:
	distros/ubuntu1504_cmake/control
 2016-03-29 11:53:17 -04:00
Isaac Connor e3564f6a63 add zmtelemtry.pl 2016-03-29 11:51:03 -04:00
Sándor Czettner 38e3c92546 Minor grammar fixes 2016-03-25 13:18:43 +00:00
Isaac Connor 6d4d05184c fix typo 2016-03-23 09:49:38 -04:00
Isaac Connor d3558c5688 Merge pull request #1323 from knnniggett/zmfilter 
fix missing Net::SFTP::Foreign::debug warning
 2016-03-21 10:47:50 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Kyle Johnson 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
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths. 
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
 2016-03-11 14:28:16 -07:00
Andrew Bauer facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Andrew Bauer 4606d2fbca Update zmtrigger.pl.in 
mention the %Q placholder when using showtext
 2016-03-10 10:13:38 -06:00
Isaac Connor 313f46dceb add zmtelemetry.pl to autotools build 2016-03-09 11:26:10 -05:00
Isaac Connor 0e8fc7953d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:46:10 -05:00
Andy Bauer ab3c35c629 fix missing Net::SFTP::Foreign::debug warning 2016-03-04 17:21:32 -06:00
Isaac Connor 0d8c63f578 Merge branch 'master' into storageareas 2016-03-02 09:11:55 -05:00
Kyle Johnson bc89b95470 Merge pull request #1292 from ZoneMinder/telemetry 
Telemetry Data
 2016-03-01 07:17:16 -07:00