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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
|
Isaac Connor
|
f64d65e6d7
|
Make db errors not fatal when deleting an event
|
2017-12-12 10:55:09 -05:00 |
|
Isaac Connor
|
e7a43b2618
|
fix, don't set the storage path to NULL
|
2017-12-06 10:11:59 -08:00 |
|
Isaac Connor
|
073b055b4c
|
fix Event Moving
|
2017-12-05 10:21:43 -08:00 |
|
Isaac Connor
|
b1a887dbd8
|
fixes to move Event
|
2017-12-05 10:02:21 -08:00 |
|
Isaac Connor
|
82bed8f3fa
|
actually delete the old files when we move an event
|
2017-12-05 08:43:13 -08:00 |
|
Isaac Connor
|
203fe79391
|
cleanup debug
|
2017-12-04 11:14:55 -05:00 |
|
Isaac Connor
|
1ccd344bf5
|
implement Storage Area move
|
2017-12-04 11:05:50 -05:00 |
digital-gnome
|
0a995aea78
|
Add navbar refresh to all pages that use it
|
2017-11-30 16:33:46 -05:00 |
|
Isaac Connor
|
c2ff010d27
|
Support NULL in date/time values
|
2017-11-27 10:04:08 -08:00 |
|
Isaac Connor
|
489d3ba6ed
|
Merge ../ZoneMinder.master into storageareas
|
2017-11-21 12:23:17 -05:00 |
Ognyan Bankov
|
ded6b1864a
|
2006 support floureon 1080p 18x 30x (#2007)
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
|
2017-11-18 19:02:23 -05:00 |
|
Isaac Connor
|
09a715a99f
|
prevent a warning
|
2017-11-18 09:41:37 -05:00 |
APHW2 MFGENG
|
2ffa79172a
|
Only load Name,Value when loading config because that's all we use
|
2017-11-06 08:36:53 -08:00 |
|
Isaac Connor
|
31b756bd53
|
add missing tests for StartDateTime etc
|
2017-11-03 07:18:30 -04:00 |
|
Isaac Connor
|
cb01b96dc0
|
fixes
|
2017-11-01 12:01:11 -07:00 |
|
Isaac Connor
|
ae8bfadcf7
|
use static logging method
|
2017-10-27 21:13:14 -07:00 |