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

691 Commits

Author SHA1 Message Date
Isaac Connor a82e17ff4b Merge branch 'storageareas' into zma_to_thread 2018-02-12 17:16:33 -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 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 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 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 9a15328894 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
 2018-01-26 13:02:16 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -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
Isaac Connor 71263c525b :Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
 2018-01-24 11:55:32 -05:00
Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php
 2018-01-24 11:06:19 -05:00
Isaac Connor cf4ac74d02 If failed to delete from Frames or Stats, return instead of deleting the event. 2018-01-24 10:45:42 -05:00
Simpler1 ce19c65cc9 Ipcc (#2040) 
* fix(ipcc): Invert up/down to work properly

* fix(ipcc): Change the initial values for ipcc camera
 2018-01-22 15:33:11 -05:00
Isaac Connor 37ff7c3779 Add finding by Id to Event 2018-01-22 15:26:01 -05:00
Isaac Connor 2068a5c684 Add object caching 2018-01-22 15:25:51 -05:00
Isaac Connor b317748796 Add Server loading 2018-01-22 11:09:49 -05:00
Isaac Connor 493a2386c4 Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time. 2018-01-22 11:09:35 -05:00
Isaac c5332a255b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-21 21:11:28 +01:00
Isaac fedd67a7f6 add to_string 2018-01-21 21:11:05 +01:00
Isaac Connor f0d4cab24a Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	web/ajax/add_monitors.php
 2018-01-21 11:13:06 -05:00
Isaac Connor 43d72decac Turn off extra debugging 2018-01-19 18:24:59 -05:00
Isaac Connor dfce773341 We should return the value of DiskSpace 2018-01-19 13:32:28 -05:00
Isaac 62704601ca We should return the value of DIskSpace 2018-01-19 19:22:43 +01:00
Isaac Connor 9fb1074875 add auto-scheme detection from path. Fix de-tainting in delete_files 2018-01-19 11:39:31 -05:00
Isaac Connor e37d27e972 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_monitor.cpp
 2018-01-18 13:44:26 -05:00
Isaac Connor 5472a1a012 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-18 11:40:37 -05:00
Isaac Connor 715adb5acb add locking to Event moving and diskspace updating. 2018-01-18 11:38:08 -05:00
Isaac Connor eb92a1ed8b merge updates that fix Event moving 2018-01-17 12:59:34 -08:00
Isaac Connor b35e6adc8f Merge branch 'storageareas' into zma_to_thread 2018-01-16 17:55:08 -05:00
Isaac Connor 573c44839a Merge branch 'storageareas' into zma_to_thread 2018-01-16 17:39:37 -05:00
Isaac Connor 426976ddb7 cleanup return code 2018-01-16 14:04:44 -05:00
Isaac Connor aaa6c5cccb Only delete files if no error 2018-01-16 14:01:26 -05:00
Isaac Connor 1d6c9d6edd Empty Storage Name should not be Fatal 2018-01-13 10:14:11 -05:00
Isaac 12d310a9cb Cleanup 2018-01-11 22:53:34 +01:00
Isaac Connor 5792021ee3 Merge branch 'storageareas' into fugro 2018-01-10 15:08:28 -05:00
Isaac Connor c3ab7d5269 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_packetqueue.cpp
	src/zma.cpp
 2018-01-10 14:24:46 -05:00
Isaac Connor f14859d7d0 Add ZM_STATS_UPDATE_INTERVAL 2018-01-10 13:20:24 -05:00
Isaac Connor e28b6c8b7c When server is NULL, don't escape the NULL 2018-01-09 07:29:32 -08:00
Isaac Connor 36ef0f5011 Merge branch 'storageareas' into zma_to_thread 2018-01-05 10:06:18 -05:00
Isaac Connor 4e24e3647e Also join the Storage table, and use it for ServerId instead of Monitors table. 2018-01-03 07:20:20 -08:00
Isaac Connor 485741b6f7 treat File exists as a non-error 2018-01-02 12:44:47 -08:00
Isaac Connor 867f2a9166 simplify deleting event files. The old way was too intensive. 2018-01-02 09:15:50 -08:00
Isaac Connor 148e21d707 fugro 2017-12-21 21:46:21 -05:00
Isaac Connor f036e95793 fix Moving when Medium Scheme 2017-12-21 16:53:22 -08:00