Isaac Connor
|
90820ab92a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-07 10:37:04 -05:00 |
|
Isaac Connor
|
bd73e7c2e2
|
Merge branch 'robots' into storageareas
|
2017-12-07 10:31:25 -05:00 |
Isaac Connor
|
e7a43b2618
|
fix, don't set the storage path to NULL
|
2017-12-06 10:11:59 -08:00 |
Isaac Connor
|
933cdedaa6
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-06 11:58:29 -05: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
|
588f63b053
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-04 17:07:16 -05: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 |
|
Isaac Connor
|
bab308ffa8
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-03 12:43:31 -05:00 |
|
Isaac Connor
|
4d73ce4109
|
rework locking to have a per-packet mutex
|
2017-12-03 11:09:01 -05:00 |
digital-gnome
|
0a995aea78
|
Add navbar refresh to all pages that use it
|
2017-11-30 16:33:46 -05:00 |
|
Isaac Connor
|
db5cf998ad
|
Turn off debug
|
2017-11-27 15:43:21 -05:00 |
|
Isaac Connor
|
9f57c819cd
|
Merge branch 'tesla' into zma_to_thread
|
2017-11-27 14:57:38 -05:00 |
|
Isaac Connor
|
c2ff010d27
|
Support NULL in date/time values
|
2017-11-27 10:04:08 -08:00 |
|
Isaac Connor
|
99968dfa2a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-27 11:28:36 -05:00 |
|
Isaac Connor
|
4b92a788f7
|
fix filter execute
|
2017-11-24 15:37:50 -05:00 |
|
Isaac Connor
|
485567349d
|
Don't calc DiskSpace if it is already defined
|
2017-11-23 07:29:05 -08:00 |
|
Isaac Connor
|
9d6b417b60
|
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
|
2017-11-22 17:03:37 -08:00 |
|
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
bf6312a8ec
|
put back zma
|
2017-11-21 23:56:05 -05:00 |
|
Isaac Connor
|
c6515b7564
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-21 12:28:41 -05:00 |
|
Isaac Connor
|
489d3ba6ed
|
Merge ../ZoneMinder.master into storageareas
|
2017-11-21 12:23:17 -05:00 |
|
Isaac Connor
|
43b71fc49b
|
rework
|
2017-11-20 15:32:40 -05:00 |
|
Isaac Connor
|
c70a9f665a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-20 12:08:16 -05:00 |
|
Isaac Connor
|
95c19fa674
|
Make zmaudit check for a pid file and not running if it exists
|
2017-11-20 11:55:42 -05:00 |
|
Isaac Connor
|
74650ebc70
|
simplify Analysis
|
2017-11-20 11:48:56 -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 |
|
Isaac Connor
|
bac3fbfce9
|
fix compile on old ffmpeg
|
2017-11-14 08:55:00 -08:00 |
APHW2 MFGENG
|
d15d36f389
|
rework, compiles, won't open h264
|
2017-11-09 11:50:20 -08:00 |
|
APHW2 MFGENG
|
4e080b8a36
|
Merge branch 'storageareas' into ffmpeg_output
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
scripts/ZoneMinder/lib/ZoneMinder/Object.pm
|
2017-11-07 18:25:33 -08: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 |
|
Isaac Connor
|
b3d65729da
|
apache style logging function take a logging object
|
2017-10-27 21:13:01 -07:00 |
|
Isaac Connor
|
2003798e64
|
copy in start and end transaction
|
2017-10-27 21:06:11 -07:00 |
|
Isaac Connor
|
2d6998ad25
|
fix debug_all
|
2017-10-27 20:54:54 -07:00 |
|
Isaac Connor
|
2d8a4794de
|
add save, set, transform, and some globals pointing to dbh and log
|
2017-10-27 20:54:29 -07:00 |
|
Isaac Connor
|
8b4468caed
|
add apache log style aliases
|
2017-10-27 20:54:19 -07:00 |
|
Isaac Connor
|
11fc755db2
|
fix debug_all
|
2017-10-27 15:21:10 -07:00 |
|
Isaac Connor
|
663cc6df87
|
improve logging of zmfilter
|
2017-10-27 09:09:12 -07:00 |
|
Isaac Connor
|
e84bf6260b
|
add save, set, transform, and some globals pointing to dbh and log
|
2017-10-27 09:05:25 -07:00 |
|
Isaac Connor
|
230daa74da
|
add apache log style aliases
|
2017-10-27 09:05:07 -07:00 |
|
Isaac Connor
|
82fbec697f
|
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
|
2017-10-27 08:37:53 -07:00 |
|
Isaac Connor
|
e27b95c820
|
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
|
2017-10-27 08:05:35 -07:00 |
|
Isaac Connor
|
0fbb473dd4
|
refactoring
|
2017-10-25 13:06:15 -07:00 |
|
Isaac Connor
|
653d213d62
|
Add EndTime and DiskSpace to Filters
|
2017-10-25 11:11:19 -07:00 |