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

2712 Commits

Author SHA1 Message Date
Isaac Connor a30610fbda Merge branch 'master' into storageareas 2016-07-12 10:31:10 -04:00
Isaac Connor 410e154b7f code style 2016-07-12 10:29:40 -04:00
Steve Gilvarry 3eccdcd3e2 Merge pull request #1524 from ZoneMinder/add_api_auth 
if user=&pass= are in request, use them for auth in api
 2016-06-29 21:47:44 +10:00
Steve Gilvarry f3779d543c Merge pull request #1521 from ZoneMinder/fix_zone_edit 
update area when points move
 2016-06-29 21:46:28 +10:00
Steve Gilvarry bdd0790106 Merge pull request #1522 from ZoneMinder/video_session 
Move the session start down to where it is actually needed so that we…
 2016-06-29 21:45:12 +10:00
Isaac Connor 9f00971e6b Use Debug for debug output instead of Error 2016-06-27 10:27:26 -04:00
Isaac Connor 4fc68c0aa0 Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by 2016-06-27 10:26:37 -04:00
Isaac Connor 6ab2b33e95 fix merge 2016-06-27 09:10:35 -04:00
Isaac Connor 6e4c8fa224 need to set the Id when duping 2016-06-24 10:31:15 -04:00
Isaac Connor 791c8fb3d5 add setting of object property 2016-06-24 10:30:56 -04:00
Isaac Connor d732d9a49a fix merge 2016-06-24 10:02:20 -04:00
Isaac Connor c1f30480e3 fix merge 2016-06-23 12:49:27 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Isaac Connor 31a5252afa apply btn and btn-primary styles to remaining buttons on console 2016-06-21 09:22:32 -04:00
Isaac Connor 513de21260 Merge branch 'add_api_auth' into storageareas 2016-06-21 09:10:06 -04:00
Isaac Connor b4aec41d3d fix warnings and move User import up higher to where it needs to be 2016-06-21 09:09:58 -04:00
Isaac Connor 4230bd1bd5 move the control_fields into the class so that it is available. 2016-06-20 12:46:23 -04:00
Isaac Connor 9c7b22086f introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable 2016-06-20 12:41:14 -04:00
Isaac Connor 1d1cedce95 use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode 2016-06-20 12:40:33 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 3914e0b394 :Merge branch 'fix_zone_edit' into storageareas 2016-06-16 12:04:18 -04:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Steve Gilvarry d0e08b32f5 Merge pull request #1506 from Disassembler0/master 
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
 2016-06-17 00:01:08 +10:00
Isaac Connor 8e7665d397 use getStreamHTML instead of duplicated code 2016-06-14 12:40:18 -04:00
Isaac Connor d5d48bef8a clean out unused variables and don't scale the popup window. The contents of it won't be scaled. 2016-06-14 12:39:51 -04:00
Isaac Connor bfa46e26ee Use monitor Id instead of the array index. Id is unique, so just use it. 2016-06-14 12:39:15 -04:00
Isaac Connor acba5bccf1 Always include the monitor Id in the tag id for the videostream 2016-06-14 12:38:37 -04:00
Isaac Connor 0f1a1a6294 log invalid calls to Monitor Object 2016-06-14 12:38:17 -04:00
Steve Gilvarry f804f7739d Adjust download file path to swap path to match the file generated. 2016-06-14 20:49:38 +10:00
Isaac Connor abad7cbf9f Merge branch 'fix_zone_edit' into storageareas 2016-06-13 09:43:03 -04:00
Isaac Connor 83ac4cd061 change the input handler from onchange to oninput. Disable form submit when hitting enter 2016-06-13 09:40:04 -04:00
Isaac Connor 632ec38d7d Put back in neccessary callt o updateArea 2016-06-12 16:10:24 -04:00
Isaac Connor 4f2e0edb44 remove unnecssary updateAreas 
remove unnecessary updateZoneImage
 2016-06-07 21:23:30 -04:00
Isaac Connor c3043c1487 cleanups, remove unneccessary updateArea calls 2016-06-07 21:22:22 -04:00
Isaac Connor 4fbab64368 Merge branch 'add_api_auth' into storageareas 2016-06-07 16:33:50 -04:00
Isaac Connor dbdd1ae51e remove debug logging 2016-06-07 16:26:58 -04:00
Isaac Connor f26c9168c4 if user=&pass= are in request, use them for auth 2016-06-07 16:25:35 -04:00
Isaac Connor 94174a1fe2 use user= and pass= instead of auth hash 2016-06-07 15:47:59 -04:00
Isaac Connor 5f76cc8677 accept user=&pass= in url for auth 2016-06-07 15:14:47 -04:00
Isaac Connor 086d435712 send zmcCommand to api on server 2016-06-07 14:39:59 -04:00
Isaac Connor b2dfdea66e Merge branch 'fix_zone_edit' into storageareas 2016-06-07 11:45:50 -04:00
Isaac Connor 593fe2b0c5 update area when points move 2016-06-07 11:40:53 -04:00
Isaac Connor 1930b18100 Move the session start down to where it is actually needed so that we don't hold it open while generating videos 2016-06-07 10:38:37 -04:00
Isaac Connor bb6adc3012 fix missing space 2016-06-07 09:37:05 -04:00
Isaac Connor f0ec2a65ee Merge branch 'fix_errors_when_event_not_found' into storageareas 2016-06-03 10:47:47 -04:00
Isaac Connor 380b86614f put quotes around integer values that will be empty strings if the event is not found 2016-06-03 10:46:21 -04:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Isaac Connor 060988c05c set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding 2016-05-31 16:02:37 -04:00
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit 
Fix zone edit
 2016-05-31 10:33:31 -05:00