mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-27 08:48:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,022 Commits 107 Branches 109 Tags
646f0dd65ecbd4a553cfa67aaaf10b86fdd77c44
Commit Graph
1685 Commits
Author SHA1 Message Date
Isaac Connor 03d3f5e665 Merge branch 'storageareas' into zma_to_thread 2018-03-03 13:28:01 -08:00
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Isaac Connor 83785ac73f Merge branch 'storageareas' into zma_to_thread 2018-02-22 09:41:50 -05:00
Isaac Connor 3eaf95c607 handle Storage reload request 2018-02-21 14:09:51 -05:00
Isaac Connor 449ac87af1 force reload on Storage in Event object when moving 2018-02-21 14:09:12 -05:00
Isaac Connor af560b8291 SIG{TERM} can be empty 2018-02-19 15:14:36 -05:00
Isaac Connor ddeb2e61ef add error logging 2018-02-18 11:29:15 -05:00
Isaac Connor e634e0addc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-02-17 12:25:42 -05:00
Isaac Connor 6883350e47 spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed 2018-02-15 10:00:13 -05:00
Isaac Connor ebb0c9eec6 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:30 -05:00
Isaac Connor b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor af003227c3 Don't do day/hour/week/month totals from main events table anymore 2018-02-13 11:41:35 -05:00
Isaac Connor 6cfce1d5f2 Improve logging 2018-02-13 11:27:20 -05:00
Isaac Connor 0f2cf65039 adjust kill timeouts. Give each process up to 10 seconds to exit 2018-02-13 06:21:39 -05:00
Isaac Connor a82e17ff4b Merge branch 'storageareas' into zma_to_thread 2018-02-12 17:16:33 -05:00
Isaac Connor 62b0a1ecdc Add some debugging to tell what we are doing 2018-02-12 13:25:11 -05:00
Isaac Connor c0eb0011f0 Make some errors just errors instead of fatal. Add a check for plural days in log cleaning 2018-02-11 14:18:10 -05:00
Isaac Connor 956f9ee193 if there is a custom term handler in place, call it when Fatal 2018-02-11 14:17:44 -05:00
Isaac 208d563e11 fix Event => __git_main[0] 2018-02-09 02:09:00 +01:00
Isaac Connor 4b6f40dd9f Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_monitor.cpp
 2018-02-08 12:40:24 -05:00
Isaac Connor 069d53a9a0 Add the object debug when path to event does not exist in DiskSpace 2018-02-07 08:02:37 -05:00
Isaac Connor d8e4b0abfb Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	scripts/zmwatch.pl.in
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	src/zmc.cpp
 2018-02-06 10:34:17 -05:00
flashoftheblades 630dde26d1 Add files via upload 2018-02-05 18:52:05 -05:00
Isaac Connor 8e547134d5 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:50:19 -05:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor 4b7ddd81bf Merge branch 'storageareas' into zma_to_thread 2018-02-02 14:24:02 -05:00
Isaac Connor a1392bf613 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_mpeg.cpp
	src/zmc.cpp
 2018-02-02 14:23:26 -05:00
Isaac Connor f702b37445 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-02-02 12:09:03 -05:00
Isaac Connor 8e8b6bdc36 Select Events by StorageArea 2018-02-02 12:08:54 -05:00
Isaac Connor 0287868f5e include the status when error runCommand 2018-02-02 11:06:47 -05:00
Isaac Connor 87ef17dddc errors running a command should NOT exit! 2018-02-02 11:05:56 -05:00
Isaac Connor 2861779249 move zmonvif-probe.pl from the onvif library code and update it to use ZoneMinder::ONVIF 2018-01-31 16:57:17 -05:00
Isaac Connor c96f47886c Fix discover not picking up a 1.2 response if we already have a 1.1 2018-01-31 16:56:46 -05:00
Isaac Connor 4933b37b69 fix log levels 2018-01-30 10:45:32 -05:00
Isaac Connor aea1816e8e Add in signal handlers to as to complete an action before exiting. 2018-01-30 09:19:08 -05:00
Isaac Connor 9f5c8078fc handle when reading the link returns nothing 2018-01-29 21:16:41 -05:00
Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	web/includes/Monitor.php
	web/skins/classic/views/js/add_monitors.js
	web/skins/classic/views/js/console.js
 2018-01-29 15:53:26 -05:00
Isaac Connor 3c635d2f6a Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 13:07:59 -08:00
Isaac Connor 7fc29fe681 List starttime of orphaned event 2018-01-26 16:07:26 -05:00
Isaac Connor e824f0abfe use a big Y to indicate that hitting enter will result in Y. Also list q as an option to quit 2018-01-26 16:05:43 -05:00
Isaac Connor 30404203ea Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 12:54:56 -08:00
Isaac Connor a12030fda7 Handle no storageareas found 2018-01-26 12:54:54 -08:00
Isaac Connor 2f39e44f91 Finish implementing single monitor mod 2018-01-26 15:53:47 -05:00
Isaac Connor 9a15328894 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
 2018-01-26 13:02:16 -05:00
Isaac Connor 209093a4c6 Improve debug output 2018-01-26 10:32:37 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor c930a7cce6 fix crash 2018-01-24 15:29:49 -05:00
Isaac Connor e4c900a868 Use a LEFT JOIN on Storage WHEN Running Filters 2018-01-24 12:34:06 -05:00
Isaac Connor 1800c6fcf0 Add locking around Event deletion 2018-01-24 12:16:34 -05:00
Isaac Connor 6883159ad0 Use a LEFT JOIN on Storage WHEN Running Filters 2018-01-24 12:15:35 -05:00