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

10907 Commits

Author SHA1 Message Date
Isaac Connor cd606dbab8 whitespace 2018-02-07 08:03:01 -05:00
Isaac Connor 0d5c8f385f fix DiskSpace summing when Nulls are present 2018-02-07 08:02:49 -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 4c5e47b050 fix DiskSpace summing when Nulls are present 2018-02-07 08:02:05 -05:00
Isaac Connor 8343793c48 Fix updating Storage area DiskSpace by using COALESCE 2018-02-06 11:34:40 -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
Isaac Connor 0f83dfc769 Correct events_day, etc update trigger 2018-02-06 08:43:09 -05:00
Isaac Connor 4bd92a3b94 fixes 2018-02-05 23:01:04 -05:00
Isaac Connor c767d79aef fix typo 2018-02-05 22:59:37 -05:00
Isaac Connor a4c956da7d Only update db entry when value changes 2018-02-05 22:59:22 -05:00
Isaac Connor 86ae1b6598 Add missing commas 2018-02-05 17:31:34 -05:00
Isaac Connor 88f8cee9f6 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-05 15:47:05 -05:00
Isaac Connor 9e000b1112 bump version for new triggers 2018-02-05 15:46:52 -05:00
Isaac Connor 6822643d22 add update triggers for all the event tables so that diskspace counts work 2018-02-05 15:46:39 -05:00
Isaac Connor af67e3b686 whitespace 2018-02-04 11:54:25 -08:00
Isaac Connor 310193791d add a 10 second sleep before reconneting 2018-02-04 11:54:11 -08:00
Isaac Connor cfb7987f0f Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:54:30 -05:00
Isaac Connor a7171eccf6 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:54:01 -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 73f7026643 use COALESCE to ensure integer values 2018-02-03 11:01:33 -05:00
Isaac Connor 12c4ab07ea use COALESCE to ensure integer values 2018-02-03 11:01:26 -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 058b2be9a7 fix chosen sprites 2018-02-02 13:26:44 -05:00
Isaac Connor 93996402d9 turn off debug 2018-02-02 13:24:07 -05:00
Isaac Connor 515af57c56 Fix some styles on filter edit 2018-02-02 13:24:01 -05:00
Isaac Connor dee843d7da add All and remove default from Storage dropdown options 2018-02-02 12:48:49 -05:00
Isaac Connor 060e6893cc fix Storage dropdown population and don't clear value on line type change 2018-02-02 12:48:22 -05:00
Isaac Connor e8ace6d4dd include base version of jquery-ui-theme 2018-02-02 12:47:51 -05:00
Isaac Connor b0f755b5fc put unarchive, archive, delete in a transaction for speed 2018-02-02 12:14:01 -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 868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -05:00
Isaac Connor 68521aa0d4 spacing, remove debug lines 2018-02-02 10:27:50 -05:00
Isaac Connor 929e49c301 early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present 2018-02-02 10:27:30 -05:00
Isaac Connor 40379f7df6 bump version 2018-02-01 11:33:56 -05:00
Isaac Connor 060acffb9d make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails. 2018-02-01 11:32:55 -05:00
Isaac Connor 73edd3221a make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails. 2018-02-01 11:32:44 -05:00
Isaac Connor 26ac1fd695 Include soap version in list of onvif cameras 2018-02-01 11:32:13 -05:00
Isaac Connor 212882efb9 db errors should NOT BE FATAL! 2018-02-01 11:31:25 -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 e7fb0f649b move zmonvif-probe.pl to ../scripts. This is in preparation for removing the onvif library from the Zoneminder source into it's own package. 2018-01-31 16:56:14 -05:00
Isaac Connor a610d564d1 tweak timeouts 2018-01-31 15:51:12 -05:00
Isaac Connor b390633f70 Fix authHash generation 2018-01-31 14:58:01 -05:00
Isaac Connor ef51a21df4 add new runstate called Connected 2018-01-31 14:36:41 -05:00
Isaac Connor 6942aaed15 whitespace 2018-01-31 14:36:01 -05:00