Isaac Connor
|
52cb2441f0
|
Bump version to 1.34.5 for release
|
2020-02-25 20:46:59 -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
|
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
|
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
|
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
|
f05dbd3b89
|
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
|
2020-02-25 14:40:47 -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
|
e630550d0f
|
bump version for release 1.34.4
|
2020-02-24 14:44:19 -05:00 |
|
Isaac Connor
|
173d58d8b3
|
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
Event list is not filtered when group is selected on console
|
2020-02-24 14:37:42 -05:00 |
|
Isaac Connor
|
55c99c5ff3
|
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
|
2020-02-24 14:34:21 -05:00 |
|
Isaac Connor
|
f4521d20e0
|
Fix applying rotation to x264encoded video which has already been rotated.
|
2020-02-24 14:12:10 -05:00 |
|
Isaac Connor
|
2d3f72188d
|
Merge pull request #2851 from connortechnology/fix_class_PTZ_presets_almost_invisible
fix_class_PTZ_presets_almost_invisible
|
2020-02-24 13:16:19 -05:00 |
|
Isaac Connor
|
d0a8d241d2
|
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
|
2020-02-24 13:13:54 -05:00 |
Pliable Pixels
|
7109bff6a7
|
mention other values for GPU
|
2020-02-24 12:44:36 -05:00 |
|
Isaac Connor
|
d7f8f201be
|
Fix zoneminder.com url getting undefined being added to it
|
2020-02-22 10:51:26 -05:00 |
|
Isaac Connor
|
6d5fcd15ff
|
Merge branch 'connortechnology-fix_user_self_edit_2841' into release-1.34
|
2020-02-19 16:57:57 -05:00 |
|
Isaac Connor
|
5aaf58fe27
|
Merge branch 'fix_user_self_edit_2841' of https://github.com/connortechnology/ZoneMinder into connortechnology-fix_user_self_edit_2841
|
2020-02-19 16:57:35 -05:00 |
|
Isaac Connor
|
1a87eb40bd
|
Fixes #2841 and maintains login through password change
|
2020-02-19 16:55:38 -05:00 |
|
Isaac Connor
|
ea2eba4110
|
bump version to 1.34.3
|
2020-02-19 13:50:27 -05:00 |
|
Isaac Connor
|
292f0ea077
|
Merge pull request #2837 from zlodag/master
#2833 Added monitor presets and controls for D-Link DCS-5020L, and minor bug fix in zmcamtool
|
2020-02-19 09:24:21 -05:00 |
zlodag
|
0c97bff645
|
monitor presets and controls for D-Link DCS-5020L
|
2020-02-19 22:50:09 +13:00 |
|
zlodag
|
1168db9df0
|
Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets
|
2020-02-19 22:47:40 +13:00 |
|
Isaac Connor
|
cac7ddd89d
|
Discover that authority also contains port. Remove redundant stuff.
|
2020-02-18 16:48:08 -05:00 |
|
Isaac Connor
|
9a21ebf696
|
Remove unneeded test for :80
|
2020-02-18 15:10:44 -05:00 |
|
Isaac Connor
|
789db4e5a6
|
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
|
2020-02-18 13:29:06 -05:00 |
|
Isaac Connor
|
568c42cfa9
|
Use URI to better handle ControlAddress parsing.
|
2020-02-18 13:05:45 -05:00 |
|
Isaac Connor
|
223b618f74
|
quotes
|
2020-02-18 11:08:05 -05:00 |
|
Isaac Connor
|
179da58bc8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-17 16:32:52 -05:00 |
|
Isaac Connor
|
c337fb921d
|
Don't die if no MetaDataConfigurations
|
2020-02-17 16:32:37 -05:00 |
|
Isaac Connor
|
290c3f2bfc
|
Merge pull request #2835 from zlodag/master
simple bug fixes
|
2020-02-15 20:20:09 -05:00 |
|
Isaac Connor
|
ad9d12f0c6
|
Merge pull request #2834 from firefly2442/api-spelling
fix spelling
|
2020-02-15 20:17:54 -05:00 |
|
zlodag
|
a8615c1c85
|
fixed bug in control functions where left arrow panStep was inverted
|
2020-02-16 11:41:14 +13:00 |
|
zlodag
|
2c51b1436c
|
cleaned input for "zmcamtool.pl --export <control_or_preset_name>" to fix error when running in taint mode
|
2020-02-16 11:41:06 +13:00 |
Patrick
|
6abc91c11d
|
fix spelling
|
2020-02-15 13:52:35 -07:00 |
|
Isaac Connor
|
9c65a8b293
|
handle Amcrest cameras giving a 401 Unauthorized on the first attempt to send a command. Just send another.
|
2020-02-12 12:34:43 -05:00 |
|
Isaac Connor
|
eb5ef5203a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-11 17:40:46 -05:00 |
|
Isaac Connor
|
cc9add9310
|
fall back to ControlAddress if first ptz get fails
|
2020-02-11 17:40:33 -05:00 |
|
Isaac Connor
|
65ea0e5076
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2020-02-11 17:10:12 -05:00 |
|
Isaac Connor
|
e6785fca90
|
fix repo when doing a release
|
2020-02-11 17:10:08 -05:00 |
|
Isaac Connor
|
050d02f1fa
|
Merge pull request #2832 from connortechnology/fix_2831
Fix 2831
|
2020-02-11 17:09:07 -05:00 |
|
Isaac Connor
|
4758b2304a
|
Do not alter the start time of an event
|
2020-02-11 15:02:12 -05:00 |
|
Isaac Connor
|
289bde869d
|
use a better language for unset value
|
2020-02-11 14:31:48 -05:00 |
|
Isaac Connor
|
9f9a97f596
|
fix dropdown with unset option
|
2020-02-11 14:29:21 -05:00 |
|
Isaac Connor
|
844ff529e1
|
add an unset value to ZM_TIMEZONE in Options->System
|
2020-02-11 13:24:26 -05:00 |
|
Isaac Connor
|
600dbba8c5
|
We don't need to set date_default_timezone_get
|
2020-02-11 13:23:53 -05:00 |
|
Isaac Connor
|
821355c117
|
Only set date.timezone if we have a configured value in the Config
|
2020-02-11 13:21:28 -05:00 |