Isaac Connor
|
e3e9fd2bc1
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-02 12:08:32 -05:00 |
|
Isaac Connor
|
7c21f065bd
|
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 12:07:11 -05:00 |
|
Isaac Connor
|
d0e70fc501
|
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
|
2020-03-02 12:04:45 -05:00 |
|
Isaac Connor
|
8f113ad030
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-02 11:55:08 -05:00 |
|
Isaac Connor
|
967e5ad30f
|
alter setButtonState to take either an id or an element so that we can log the missing element
|
2020-03-02 11:52:32 -05:00 |
|
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 |
hax0kartik
|
cfcaf0fb81
|
Change how cmake looks for gnutls and gnutls-openssl
|
2020-03-01 08:42:39 -08:00 |
|
hax0kartik
|
70ef3d0eba
|
Look for gnutls-openssl and gnutls separately
|
2020-03-01 08:33:56 -08:00 |
|
Isaac Connor
|
76131d1887
|
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
|
2020-03-01 11:07:31 -05:00 |
|
hax0kartik
|
182120343f
|
Fix an issue while finding libjwt-gnutls and add a missing include
|
2020-03-01 06:17:43 -08: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
|
04b78ac7e6
|
typo and punctuation fixes.
|
2020-02-27 17:56:56 -05:00 |
|
Isaac Connor
|
6456d52b97
|
Merge branch 'fix_user_lang'
|
2020-02-27 17:43:51 -05:00 |
|
Isaac Connor
|
d371da7b4f
|
including the language files must come after auth in order to user the user's language setting
|
2020-02-27 17:42:02 -05:00 |
|
Isaac Connor
|
e19332f36a
|
tidy up, be more efficient and warn when language files are not found.
|
2020-02-27 17:40:31 -05:00 |
|
Isaac Connor
|
40627ab102
|
fix build outside of build directory
|
2020-02-27 12:00:09 -05:00 |
|
Isaac Connor
|
40742503b9
|
Add a warning when there is no AVCODEC
|
2020-02-27 11:56:49 -05:00 |
|
Isaac Connor
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -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 |