mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-28 16:11:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,177 Commits 66 Branches 101 Tags
8a61fb253202884ede1eae654182b03abdfe37ea
Commit Graph

1685 Commits

Author SHA1 Message Date
Isaac Connor
a868bb70ed Better debug when fail to attach images 2018-04-20 15:56:14 -04:00
Isaac Connor
1d4e79feb1 Update filters a bit, using Event as an object to get the Path, etc 2018-04-20 15:22:31 -04:00
Isaac Connor
5a93458441 add StartTime to Filters 2018-04-20 15:22:12 -04:00
Isaac Connor
64c3c21564 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-19 14:22:23 -04:00
Isaac Connor
2516846176 only update DiskSpace if new DiskSpace is defined 2018-04-19 14:22:19 -04:00
Isaac Connor
e6525ce59e Introduce a level param, and use it to turn on checks that shouldn't need to be done anymore, due to foreign keys 2018-04-19 08:18:23 -07:00
Isaac Connor
5fe7b3f55f increase process kill time to 100 secs. zma can sometimes take this long 2018-04-19 08:17:37 -07:00
Isaac Connor
477e96a4a6 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-19 07:46:28 -07:00
Isaac Connor
d9a035a45d Remove commit that is unneccesary 2018-04-19 07:38:39 -07:00
Isaac Connor
696b17e92e include path to where we are not deleting from in teh debug output 2018-04-19 07:37:11 -07:00
Isaac Connor
c7f672fabd SIGNAL_CHECK_POINTS is now a per-monitor setting 2018-04-19 09:59:10 -04:00
Isaac Connor
d01682f3ad remove second use 2018-04-18 21:46:55 -04:00
Isaac Connor
c27aa5efea Need to actually export CpuLoad 2018-04-18 21:44:37 -04:00
Isaac Connor
6dae6d8949 fix doubled use 2018-04-18 21:29:35 -04:00
Isaac Connor
fcaac016b5 Merge ../ZoneMinder.connortechnology 2018-04-18 21:12:14 -04:00
Isaac Connor
70b8188cc1 make MoveTo more efficient by bailing early if it has already been moved. Also add a check for it's Old storage area changing. 2018-04-18 13:48:01 -07:00
Isaac Connor
00b7ae9006 put in missing my 2018-04-18 10:07:50 -04:00
Isaac Connor
1040afbda4 change message about not deleting files for speed 2018-04-18 09:27:11 -04:00
Isaac Connor
bfe82e297a Default an empty Storage to doing Deletes 2018-04-18 09:26:36 -04:00
Andrew Bauer
04cb1f9300 use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad (#2080) 2018-04-17 21:09:41 -04:00
Isaac Connor
7e7e353a8c Use a more efficient SQL when finding Orphaned Frames 2018-04-17 08:47:11 -07:00
Isaac Connor
05fdc51be0 Fix Sql caching 2018-04-14 15:05:05 -04:00
Isaac Connor
925f640118 Fix Filters using a cached SQL 2018-04-14 11:09:01 -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
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
3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -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