Isaac Connor
3221473038
Merge branch 'storageareas' into zma_to_thread
2018-04-14 16:57:50 -04:00
Isaac Connor
05fdc51be0
Fix Sql caching
2018-04-14 15:05:05 -04:00
Isaac Connor
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
Isaac Connor
41c52f25b7
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:57:18 -04:00
Isaac Connor
925f640118
Fix Filters using a cached SQL
2018-04-14 11:09:01 -04:00
Isaac Connor
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
Isaac Connor
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
Isaac Connor
9fde052d39
merge
2018-04-03 14:41:32 -07:00
Isaac Connor
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
Pliable Pixels
e5505de1d1
fixed brace styling
2018-03-29 11:27:31 -04:00
Pliable Pixels
d64e58e374
silly mistake - wrong names
2018-03-29 11:23:35 -04:00
Pliable Pixels
95eb1d3045
merged master storage areas, resolved conflicts
2018-03-29 08:51:35 -04:00
Pliable Pixels
990d60926e
#92 new key
2018-03-29 08:47:55 -04:00
Isaac Connor
31963dcd16
say how big the file was
2018-03-28 13:41:16 -07:00
Isaac Connor
9d5dcd7b0c
return to indicate success of load
2018-03-28 08:56:03 -07:00
Isaac Connor
3e7bc46bf9
Add Amazon S3 file deletion. Add bandwidth use in file move.
2018-03-28 08:21:57 -07:00
Isaac Connor
124d2b20eb
remove version control marker
2018-03-21 10:51:47 -04:00
Isaac Connor
f682e1da9e
Merge branch 'zmtelemetry_improvements' into storageareas
2018-03-21 10:40:32 -04:00
Isaac Connor
c34ab7c172
fix merge and sleep for interval instead of 1 hour
2018-03-21 09:28:39 -04:00
Isaac Connor
0d3957611a
Merge branch 'zmtelemetry_improvements' of github.com:ConnorTechnology/ZoneMinder into zmtelemetry_improvements
2018-03-21 09:26:54 -04:00
Isaac Connor
b50fd690dc
exit if not enabled, hence reducing code nesting. Must update lastCheck
2018-03-21 09:22:29 -04:00
Isaac Connor
ba7b2447a2
Merge branch 'master' into zmtelemetry_improvements
2018-03-21 09:07:43 -04:00
Isaac Connor
e523067df7
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:28:14 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
79b10b0166
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
2018-03-14 10:09:31 -04:00
Pliable Pixels
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
Isaac Connor
fa01dbf6af
use parent's new and AUTOLOAD methods
2018-03-09 09:19:26 -05:00
Andy Bauer
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
habibapp1365
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
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