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

7196 Commits

Author SHA1 Message Date
Isaac Connor d18bbc032f Merge pull request #1495 from pliablepixels/update-api-docs 
added alarm apis
 2016-05-22 10:15:00 -04:00
Isaac Connor 68bc10eb93 Merge pull request #1497 from ZoneMinder/zmtelemetry 
fix invalid key name in config hash
 2016-05-22 10:14:12 -04:00
Isaac Connor 1e52934dcf Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem 2016-05-20 20:33:47 -04:00
Andrew Bauer 8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05:00
Andrew Bauer 58b5194054 Merge pull request #1496 from ZoneMinder/undo_merge_db_connects 
revert the bulk of the merge_db_connects changes.
 2016-05-20 09:37:53 -05:00
Isaac Connor bb5dbf3e4a Need to import Config Data into Config 2016-05-20 09:29:40 -04:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00
arjunrc e0c5b2a78f added consoleEvents API 2016-05-19 15:15:48 -04:00
arjunrc 13feb96811 added alarm apis 2016-05-19 15:06:41 -04:00
Isaac Connor 924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00
arjunrc 4018cab743 don't pass partial data to daemoncontrol 2016-05-19 14:53:16 -04:00
Isaac Connor 8e06c0ec63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-19 12:08:56 -04:00
Isaac Connor 183f9c70a4 Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:45 -04:00
Isaac Connor d57690903d Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:25 -04:00
Andrew Bauer 8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Isaac Connor fff54e4086 update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include 2016-05-18 09:02:14 -04:00
Isaac Connor e62ea454ba Merge branch 'master' into storageareas 2016-05-17 10:48:52 -04:00
Steve Gilvarry b4b9c1f2c0 Merge pull request #1491 from ZoneMinder/gcc6_fix 
quick fix for gcc6
 2016-05-17 23:39:56 +10:00
Isaac Connor 09e4aca0be add libdata-uuid-perl to debian/ubuntu dependencies 2016-05-17 09:26:36 -04:00
Isaac Connor a826931f0b Merge pull request #1411 from altaroca/onvif-discovery-1346 
Improved WS-Discovery standard compliance
 2016-05-17 09:23:49 -04:00
Isaac Connor 58d326681a quick fix for gcc6 2016-05-17 09:17:19 -04:00
Isaac Connor 435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Isaac Connor 20c4d07a00 Merge branch 'master' into hide_rtspdescribe 2016-05-16 14:40:04 -04:00
Isaac Connor 0faa28d058 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-16 14:38:49 -04:00
Isaac Connor 6084e2d00f improve error message. The unrecognized action error happens above, so this error should just mention permissions 2016-05-16 14:38:40 -04:00
Isaac Connor 5e419e85d7 move logger down, as thisURL gets set in the skin.js and comment out overlay.js 2016-05-16 14:37:35 -04:00
Isaac Connor 710ecd5b19 Put rotation metadata in the video stream metadata where it belongs 2016-05-16 14:36:09 -04:00
Andrew Bauer 46039a1887 Merge pull request #1472 from ZoneMinder/v4l1_compat 
V4l1 compat
 2016-05-16 13:02:27 -05:00
Andrew Bauer b3d261e8d9 Merge pull request #1476 from connortechnology/whitespace 
whitespace/google code style
 2016-05-16 12:59:24 -05:00
Isaac Connor e28cb5b412 fix body padding 2016-05-16 13:29:13 -04:00
Isaac Connor 9601b30972 Add Width, Height and alt to frame 2016-05-16 13:26:44 -04:00
Isaac Connor 647e45de1b Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-16 12:24:36 -04:00
Isaac Connor d93e747cc2 Merge branch 'storageareas' of ../ZoneMinder.connortechnology into storageareas 2016-05-16 12:24:18 -04:00
Isaac Connor 0b00659f26 Merge branch 'update_zmupdate' into storageareas 2016-05-16 12:24:14 -04:00
Isaac Connor e4566f2e8e Merge branch 'update_image_view' into storageareas 2016-05-16 12:23:19 -04:00
Andrew Bauer b3c6382e6c Merge pull request #1484 from ZoneMinder/update_zmupdate 
Update zmupdate
 2016-05-16 09:55:00 -05:00
Isaac Connor df8964c1f9 use eid= & fid= instead of path to frame image. The use of view=image also provides more security. 2016-05-16 10:33:21 -04:00
Isaac Connor 235095ed5f fix URL to image view 2016-05-16 10:32:43 -04:00
Isaac Connor b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04:00
Isaac Connor 3780f8a2e6 move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module 2016-05-16 09:31:54 -04:00
Isaac Connor b15120643d Merge pull request #1480 from connortechnology/storageareas 
Storageareas
 2016-05-13 15:20:08 -04:00
Isaac Connor c11a92efdd implement 180,270 rorations and cleanup 2016-05-13 15:11:17 -04:00
Isaac Connor 943a4cef73 Merge branch 'storageareas' into rotate_video 2016-05-13 15:00:50 -04:00
Isaac Connor 71e9553648 add rotation to video 2016-05-13 14:51:26 -04:00
Isaac Connor 5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -04:00
Isaac Connor 9a1b0b79b9 don't use a dropdown for montage, etc 2016-05-13 11:43:38 -04:00
Isaac Connor a61dade6df Merge branch 'fix_montage_server_refs' into storageareas 2016-05-13 11:11:27 -04:00
Isaac Connor 3ed6014f61 Merge branch 'iconnor-updated-console' into storageareas 2016-05-13 11:11:19 -04:00
Isaac Connor 8cb2692bbb pass in the server url into the monitor object to use instead of the portal url 2016-05-13 11:09:12 -04:00