Isaac Connor
|
303cec92f6
|
Add globals, fixing timeline view
|
2020-08-11 13:47:37 -04:00 |
Andrew Bauer
|
4097693b38
|
appease the eslint nanny
|
2020-08-10 13:38:53 -05:00 |
|
Isaac Connor
|
ec707acdd1
|
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
|
2020-08-09 22:19:43 -04:00 |
|
Isaac Connor
|
fc5fabf1c5
|
fix zone editing globals and inputs being too big
|
2020-08-06 12:24:51 -04:00 |
|
Isaac Connor
|
a19990f4d7
|
Merge branch 'release-1.34'
|
2020-08-06 11:57:35 -04:00 |
|
Isaac Connor
|
ef2ad12846
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 20:00:45 -04:00 |
|
Isaac Connor
|
ddeef6f031
|
Fix globals and a Fatal without ZM\ prefix
|
2020-08-05 20:00:39 -04:00 |
Isaac Connor
|
76e0d155d3
|
declare globals
|
2020-08-05 19:15:01 -04:00 |
|
Isaac Connor
|
90671cd4e5
|
Add missing globals
|
2020-08-04 18:07:01 -04:00 |
|
Isaac Connor
|
1ab828c110
|
Add globals
|
2020-08-04 17:35:52 -04:00 |
|
Isaac Connor
|
ba4d6dff64
|
Add globals definitions
|
2020-08-04 17:05:58 -04:00 |
|
Isaac Connor
|
c0f21ab55d
|
Fix globals
|
2020-08-04 16:36:24 -04:00 |
|
Isaac Connor
|
eb1d94345f
|
remove crud
|
2020-08-03 11:05:58 -04:00 |
|
Isaac Connor
|
a2958fe288
|
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
|
2020-08-03 10:57:08 -04:00 |
|
Isaac Connor
|
6f9947b583
|
Switch to jquery in login.js. We no longer include mootool for login view.
|
2020-08-02 19:12:07 -04:00 |
|
Isaac Connor
|
6a4ce29bce
|
eslint fixes
|
2020-07-30 12:15:05 -04:00 |
|
Isaac Connor
|
e746f0babe
|
Use 0 instead of the word auto for scale
|
2020-07-22 17:28:41 -04:00 |
Andrew Bauer
|
cfd57a851f
|
fix eslint
|
2020-07-08 20:53:12 -05:00 |
|
Isaac Connor
|
880219bb0f
|
Merge branch 'release-1.34'
|
2020-07-07 18:58:32 -04:00 |
|
Isaac Connor
|
6469300af5
|
fix some csp violations
y
|
2020-07-07 18:57:11 -04:00 |
|
Isaac Connor
|
89f975e646
|
remove code to play a sound on alarm. Not going to support that when editing a zone.
|
2020-07-07 16:40:33 -04:00 |
|
Isaac Connor
|
33d4680f02
|
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
|
2020-07-07 16:35:37 -04:00 |
|
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -04:00 |
|
Isaac Connor
|
8a35ae2daf
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-07-04 09:04:38 -04:00 |
|
Isaac Connor
|
d6d70ab06d
|
Put a list of cameras to cycle through on the left
|
2020-07-04 09:04:26 -04:00 |
|
Isaac Connor
|
fd10f545bd
|
if width/height don't evaluate to an integer, set to auto.
|
2020-07-04 08:58:09 -04:00 |
|
Isaac Connor
|
343d8d832e
|
handle scale values of '' and 'auto'
|
2020-07-03 19:18:05 -04:00 |
|
Isaac Connor
|
e778ea0918
|
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
|
2020-06-23 22:19:04 -04:00 |
Romain ODDONE
|
dcb77cdaea
|
apply stream scale in zoom coordinates
|
2020-06-17 14:46:10 +02:00 |
|
Isaac Connor
|
30072cf9e1
|
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
|
2020-06-15 16:06:51 -04:00 |
|
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
|
Isaac Connor
|
02bf85bb34
|
Merge pull request #2950 from roddone/scale_to_fit_watchview
Fix the scale to fit option that is not persisted on page refresh
|
2020-06-02 12:53:50 -04:00 |
Romain ODDONE
|
a9c52a21ec
|
call to changeScale() on page init when "scale to fit" is selected
|
2020-06-02 17:25:07 +02:00 |
|
Isaac Connor
|
20870e22fa
|
fix eslint errors
|
2020-05-29 13:28:33 -04:00 |
|
Isaac Connor
|
a9cec3ebbd
|
spacing
|
2020-05-23 16:13:29 -04:00 |
|
Isaac Connor
|
46a13237b5
|
fix eslint errors
|
2020-05-22 09:28:15 -04:00 |
|
Isaac Connor
|
cc04ced406
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-20 09:42:06 -04:00 |
|
Isaac Connor
|
3faf20516f
|
add changeInterface handler
|
2020-05-19 16:58:45 -04:00 |
|
Isaac Connor
|
270ab36ff4
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-19 16:56:58 -04:00 |
|
Isaac Connor
|
6bb2c09a72
|
Merge branch 'release-1.34'
|
2020-05-15 11:41:34 -04:00 |
|
Isaac Connor
|
424a4ed0b1
|
add onclick to div.zoom
|
2020-05-15 11:34:23 -04:00 |
|
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Isaac Connor
|
edd718afd2
|
xtell and ytell are data-xtell and data-ytell fixes #2932
|
2020-05-13 08:02:49 -04:00 |
|
Isaac Connor
|
807efde523
|
xtell and ytell are data-xtell and data-ytell fixes #2932
|
2020-05-13 08:01:04 -04:00 |
|
Isaac Connor
|
2da88be307
|
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
|
2020-05-01 13:04:16 -04:00 |
|
Isaac Connor
|
4c9f67eb5a
|
Fix no redirect on login with palemoon browser
|
2020-05-01 13:03:56 -04:00 |
|
Isaac Connor
|
289045500b
|
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
|
2020-05-01 13:03:35 -04:00 |
|
Isaac Connor
|
8d8d37c648
|
fix eslint
|
2020-05-01 09:57:46 -04:00 |
|
Isaac Connor
|
74ab2e2e12
|
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
|
2020-04-29 16:35:04 -04:00 |
|
Isaac Connor
|
eebd0a274d
|
Fix no redirect on login with palemoon browser
|
2020-04-29 16:34:27 -04:00 |