Commit Graph

14599 Commits

Author SHA1 Message Date
Isaac Connor f0e7b84001 Only load user from session if other auth mechanisms aren't present. 2020-03-02 11:51:07 -05:00
Isaac Connor 5f16c10e0a Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 11:50:40 -05:00
Isaac Connor 4fb1362ac3
Merge pull request #2864 from pliablepixels/dev
better logs for tokens
2020-03-01 18:15:07 -05:00
Pliable Pixels 54c14db863 better logs 2020-03-01 14:02:44 -05:00
Isaac Connor 5257c97e20 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-29 09:28:25 -05:00
Isaac Connor b9acf42929 spacing, eslint 2020-02-29 09:28:04 -05:00
Isaac Connor 80ef98507a
Merge pull request #2863 from dbajric/master
Added presets for Amcrest IP8M-T2499EW Camera
2020-02-29 09:18:22 -05:00
Isaac Connor 6488778f8f Use ppa:iconnor/zoneminder-master instead of ppa:iconnor/zoneminder 2020-02-29 08:57:35 -05:00
Dinko Bajric 6b2f78c192 Added presets for Amcrest IP8M-T2499EW Camera 2020-02-28 21:08:02 -08:00
Isaac Connor 92f87756ff Merge branch 'release-1.34' 2020-02-28 17:14:22 -05:00
Isaac Connor 4dee3532c3 handle additional atributes on the html tag in html detection 2020-02-26 09:42:17 -05:00
Isaac Connor 52cb2441f0 Bump version to 1.34.5 for release 2020-02-25 20:46:59 -05:00
Isaac Connor bf9ba39aa2 Merge branch 'release-1.34' 2020-02-25 18:22:55 -05:00
Isaac Connor 1b70ed2076 Merge branch 'fix_generate_video_page' into release-1.34 2020-02-25 18:22:24 -05:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor a34af39ca7 Fix logging line in generate video function 2020-02-25 18:14:14 -05:00
Isaac Connor e82ed3a098 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:13:42 -05:00
Isaac Connor c08ec996f7 Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843 2020-02-25 18:12:25 -05:00
Isaac Connor 4d044a1f14 Fix logging line in generate video function 2020-02-25 18:11:07 -05:00
Isaac Connor 8fcd5b37ed API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:15:59 -05:00
Isaac Connor 7787ba1040 Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:15:45 -05:00
Isaac Connor 54a6dfff66 API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:12:48 -05:00
Isaac Connor bd097bf8ce Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:00:16 -05:00
Isaac Connor 9febf60228
Merge pull request #2858 from connortechnology/fix_zmu_using_token_auth
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
2020-02-25 16:54:35 -05:00
Isaac Connor 23e4b43aa0 Stop the montagereview update while we reload the page 2020-02-25 16:53:08 -05:00
Isaac Connor 3adc20b04e Use a little less ram by passing by reference 2020-02-25 16:52:45 -05:00
Isaac Connor 81f8f85be5 Revert "use CONCAT when updating event notes so that we don't overwrite notes set by other processes."
This reverts commit a90033e026.
2020-02-25 16:38:31 -05:00
Isaac Connor a7c782efa5
Merge pull request #2855 from firefly2442/patch-1
add area definition to zone creation via API
2020-02-25 14:44:59 -05:00
Isaac Connor 20d1cc99f4 Merge branch 'fix_zmu_using_token_auth' 2020-02-25 14:41:01 -05:00
Isaac Connor f05dbd3b89 Fix zmu not respecting jwt token auth when AUTH_RELAY set to none 2020-02-25 14:40:47 -05:00
Isaac Connor 4798fba807 Merge branch 'use_concat_when_updating_event_notes' 2020-02-25 14:16:46 -05:00
Isaac Connor a90033e026 use CONCAT when updating event notes so that we don't overwrite notes set by other processes. 2020-02-25 14:16:30 -05:00
Isaac Connor 14434e1e10
Merge pull request #2857 from connortechnology/fix_montage_review_calendar_not_updating
Fix montagereview end calendar
2020-02-25 13:44:07 -05:00
Isaac Connor 4c2fb6bf08 populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar. 2020-02-25 13:40:44 -05:00
Isaac Connor f719514998 remove debug 2020-02-25 13:39:33 -05:00
Isaac Connor 5c3b7f109e fix cyclePlay button not working. 2020-02-25 13:17:45 -05:00
Isaac Connor dce4d17b51 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-02-25 13:17:02 -05:00
Isaac Connor a2c5e4943a Merge branch 'fix_scale' 2020-02-25 12:18:27 -05:00
Isaac Connor a7c28be365 change scale to fit value from auto to 0 2020-02-25 12:14:34 -05:00
Isaac Connor 8c7d2c5e1a handle a 0 value for scale 2020-02-25 12:14:07 -05:00
Isaac Connor 4dda37a6ee remove extra } 2020-02-25 12:13:12 -05:00
Isaac Connor e2ff241017 handle a 0 value for scale as the scale to fit value 2020-02-25 12:13:05 -05:00
Isaac Connor 71dd292a8d Revert "Handle a zero value for scale"
This reverts commit a5da6d12f3.
2020-02-25 11:19:09 -05:00
Isaac Connor a5da6d12f3 Handle a zero value for scale 2020-02-25 11:18:28 -05:00
Isaac Connor 8a83449fba Handle a zero value for scale 2020-02-25 11:18:13 -05:00
Isaac Connor 2f89bd28b7 Handle a zero value for scale 2020-02-25 11:18:02 -05:00
Isaac Connor 37abd41e78 Handle a zero value for scale 2020-02-25 11:17:46 -05:00
Isaac Connor 429000c13b Fix value of auto in width dropdown. Allow a 0 value for scale. 2020-02-25 11:14:12 -05:00
Isaac Connor 638e333702 Scale must be an integer value so use '0' instead of auto 2020-02-25 11:13:20 -05:00
Isaac Connor d68d115581 Handle scale==0 to do width=100%. 2020-02-25 11:12:49 -05:00