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
|
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
|
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 |
|
Isaac Connor
|
583350ef06
|
Fix use of array_key_exists instead of property_exists
|
2020-02-25 11:09:12 -05:00 |
|
Isaac Connor
|
6cf448c74e
|
remove debug and spacing
|
2020-02-25 11:08:23 -05:00 |
|
Isaac Connor
|
cc7de97b6a
|
Merge branch 'release-1.34'
|
2020-02-24 14:39:50 -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
|
b389f9660d
|
Merge branch 'fix_class_PTZ_presets_almost_invisible'
|
2020-02-24 13:17:09 -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 |
|
Isaac Connor
|
d7f8f201be
|
Fix zoneminder.com url getting undefined being added to it
|
2020-02-22 10:51:26 -05:00 |
|
Isaac Connor
|
e640fc0c26
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-22 10:50:07 -05:00 |
|
Isaac Connor
|
63a3f2e453
|
Fix zoneminder.com url getting undefined being added to it
|
2020-02-22 10:50:00 -05:00 |
Andrew Bauer
|
c29f2cb8cf
|
fix our friend, eslint
|
2020-02-21 14:22:53 -06:00 |
|
Isaac Connor
|
ce8c8a755c
|
fix eslint
|
2020-02-21 10:29:27 -05:00 |
|
Isaac Connor
|
d51fdafbc0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-21 09:37:45 -05:00 |
|
Isaac Connor
|
7645196bdc
|
Extend width of ControlDevice and Address to full width
|
2020-02-21 09:30:31 -05:00 |
|
Isaac Connor
|
1a87eb40bd
|
Fixes #2841 and maintains login through password change
|
2020-02-19 16:55:38 -05:00 |
|
Isaac Connor
|
dab5c520fe
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-02-19 14:20:08 -05:00 |
|
Isaac Connor
|
3b1458bb88
|
add Emailed status to events list
|
2020-02-19 14:17: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 |
zlodag
|
a8615c1c85
|
fixed bug in control functions where left arrow panStep was inverted
|
2020-02-16 11:41:14 +13: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 |
|
Isaac Connor
|
137bdb1f24
|
Make shm have error or warning class if full
|
2020-02-10 14:20:46 -05:00 |
|
Isaac Connor
|
389a6b3ec8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-06 13:22:30 -05:00 |
|
Isaac Connor
|
c465fa55d8
|
Use ZM_PATH_FFMPEG instead of ffmpeg
|
2020-02-06 13:22:22 -05:00 |
|
Isaac Connor
|
1cbc75813c
|
improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:57 -05:00 |
|
Isaac Connor
|
dd0ce50c17
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:30 -05:00 |
|
Isaac Connor
|
e8a0ed9208
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:20:35 -05:00 |
|
Isaac Connor
|
1c2f2657d2
|
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
|
2020-02-04 16:41:19 -05:00 |