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

11907 Commits

Author SHA1 Message Date
Isaac Connor 94796aea2c Always make SWAP_PATH dir as under systemd it may be chrooted 2018-09-23 16:49:57 -04:00
Isaac Connor ee168bf427 Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's. 2018-09-23 16:49:06 -04:00
Isaac Connor 89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Isaac Connor 772c74243c Merge branch 'master' into storageareas 2018-09-23 12:25:17 -04:00
Isaac Connor c8c533ca2f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-23 10:51:56 -04:00
Isaac Connor c5b23807a4 put back overlay.js for log view. 2018-09-23 10:51:46 -04:00
Isaac Connor af69dab9c5 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2018-09-22 14:58:28 -04:00
Andrew Bauer b8a2e71bb6
use base64_encode for monitor probe 
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
 2018-09-21 12:00:03 -05:00
Isaac Connor 5dba17e1fc Merge branch 'master' into storageareas 2018-09-21 10:50:10 -04:00
Isaac Connor c483b4ec90 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-21 10:32:02 -04:00
Isaac Connor 3f0336e63e Fix event_id detection from link (re was wrong). Add extra check for db event when we find an event dir without identifying id info in Deep mode 2018-09-21 10:31:54 -04:00
Isaac Connor 6aa71dfc11 Fix calculation of LinkPath, as it was using RelativePath instead of Path 2018-09-21 10:31:11 -04:00
Andrew Bauer 347c0d2ae4
fix whitespace 2018-09-20 13:41:13 -05:00
Andrew Bauer ac9129b632
fix corrupted export downloads 2018-09-20 13:36:52 -05:00
Isaac Connor 999e4c6c43 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-20 13:37:46 -04:00
Isaac Connor 90d1d79e9a Add missing AutoUpload field to Filter 2018-09-20 13:37:36 -04:00
Isaac Connor a568948eab Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-20 12:31:36 -04:00
Isaac Connor 884eb48420 fix the section that deletes events that have lost their event links. 2018-09-20 12:31:19 -04:00
Jonathan Lassoff c7e1e7b901 Control plugin for Dahua PTZ cameras (#2192) 
* Control plugin for Dahua PTZ cameras

* Update http/https protocol handling

* Update doc and license

* Remove license from top of file

* Use named regex capture groups for ControlAddress parsing

* Remove trailing whitespace in Trendnet.pm
 2018-09-20 12:29:54 -04:00
Vitaly Saversky 18c2ec6e17 Misspelling and grammar (#2202) 
* Misspelling and grammar

* Misspelling something
 2018-09-20 12:14:57 -04:00
Andy Bauer f53533e61e fix populating onvif probe data 2018-09-20 10:30:23 -05:00
Isaac Connor 7fe2749de6 Merge branch 'master' into storageareas 2018-09-20 10:58:36 -04:00
Isaac Connor ba4878d2b5 fix use of instead of ['limit'] 2018-09-20 10:11:55 -04:00
Isaac Connor fe828d3d9c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-20 10:07:58 -04:00
Isaac Connor 503b40cb62 Need to cache the object not the row 2018-09-20 10:07:15 -04:00
Andrew Bauer cb00445e3e
Merge pull request #2215 from connortechnology/fix_2213 
Fix 2213
 2018-09-20 08:24:07 -05:00
Isaac Connor 520d1bb7bf Merge branch 'master' into storageareas 2018-09-20 09:08:29 -04:00
Isaac Connor 6181e52c47 gracefully handle non-existence of imageFeed 2018-09-20 09:07:28 -04:00
Isaac Connor c6e953c4a9 if Monitor is not found, return empty Monitor instead of null 2018-09-20 09:02:20 -04:00
Isaac Connor c4108a2610 Fix missing quotes inc Event::Monitor 2018-09-20 08:59:15 -04:00
Isaac Connor 7abe4c40d5 Merge branch 'fix_2213' into storageareas 2018-09-19 20:02:27 -04:00
Isaac Connor 95bcac4c5a Implement delete_empty_subdirs that uses delete_empty_directories. The idea is to use it on the monitor dir so that the monitor dir gets left behind and not deleted when there are no events 2018-09-19 20:00:26 -04:00
Isaac Connor 5d8b915c2b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-19 19:50:39 -04:00
Isaac Connor c8b10b2e3b factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason. 2018-09-19 19:50:26 -04:00
Andrew Bauer 284d622464 update the way we access mapped mem in zm-alarm.pl 2018-09-19 12:06:09 -05:00
Isaac Connor ef347f6ba3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-19 12:05:40 -04:00
Isaac Connor 3a9f96e8e8 Skip deleting event if event is archived. And event not having a scheme is now an error 2018-09-19 12:03:51 -04:00
Isaac Connor 8a5c989cac fix warning when editing users after a monitor has been deleted 2018-09-18 08:52:43 -04:00
Isaac Connor 016c6594df Merge branch 'master' into storageareas 2018-09-18 08:45:19 -04:00
Isaac Connor 7f98277571 Merge updated Monitor.php that does caching 2018-09-15 09:52:08 -04:00
Isaac Connor b0c555599c Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209 2018-09-15 09:42:59 -04:00
Isaac Connor 5dc852132e Add defaults to Server, getting rid of error log when loading the default non existent storage area 2018-09-15 09:39:40 -04:00
Isaac Connor 246b50be9c add caching to Server 2018-09-15 09:39:04 -04:00
Isaac Connor 02403c4c30 add caching to Monitor 2018-09-15 09:38:52 -04:00
Isaac Connor 27bc9d0a50 fix $limit should be $options['limit'] 2018-09-15 09:38:36 -04:00
Isaac Connor 1db59283e3 use find_one when loading Monitor to take advantage of caching 2018-09-15 09:38:09 -04:00
Isaac Connor 2b66b28689 fix $limit should be $options['limit'] 2018-09-15 09:37:44 -04:00
Isaac Connor fa55cec12c fix error when scale is auto 2018-09-14 16:57:28 -04:00
Isaac Connor 328b804465 spacing and quotes 2018-09-14 16:20:00 -04:00
Isaac Connor 870300ed93 remove debug line 2018-09-14 16:19:41 -04:00