Andrew Bauer
|
f27f6e6394
|
fix archive buttons, remove asterisk from event name
|
2020-08-16 14:46:56 -05:00 |
|
Andrew Bauer
|
94d666b296
|
tiny text under event name, add emailed column
|
2020-08-16 14:41:50 -05:00 |
|
Andrew Bauer
|
ee31761627
|
cleanup & consolidate events view buttons
|
2020-08-16 13:44:18 -05:00 |
|
Andrew Bauer
|
9be63f1d99
|
reorganize and init eventTable
|
2020-08-16 11:34:37 -05:00 |
|
Andrew Bauer
|
93475bef7e
|
eslint nanny
|
2020-08-15 16:08:53 -05:00 |
|
Andrew Bauer
|
252bf7995a
|
eslint nannt
|
2020-08-15 15:54:58 -05:00 |
|
Andrew Bauer
|
45fde13535
|
rough in new events view
|
2020-08-15 15:27:58 -05:00 |
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
|
a001c93321
|
fix zone editing globals and inputs being too big
|
2020-08-08 11:41:24 -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 |
|
Isaac Connor
|
8b0f88a707
|
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
|
2020-04-29 16:34:07 -04:00 |
|
Isaac Connor
|
bf99daf494
|
Merge branch 'rate_dropdown'
|
2020-04-23 16:36:34 -04:00 |
|
Isaac Connor
|
8ef70f9080
|
defend against XSS in Monitor Name
|
2020-04-23 16:28:19 -04:00 |
|
Isaac Connor
|
25cd13f8ad
|
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
|
2020-04-23 16:25:35 -04:00 |
|
Isaac Connor
|
da79f761ad
|
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
|
2020-04-23 16:17:27 -04:00 |
|
Isaac Connor
|
908e892d48
|
Merge branch 'fix_auth_timeouts'
|
2020-04-23 16:15:30 -04:00 |
|
Isaac Connor
|
81d329af2f
|
spacing, eslint
|
2020-04-23 16:12:04 -04:00 |
|
Isaac Connor
|
5bf068791b
|
Merge branch 'rate_dropdown' into release-1.34
|
2020-04-23 16:11:59 -04:00 |
|
Isaac Connor
|
91e78410a9
|
Stop the montagereview update while we reload the page
|
2020-04-23 16:08:36 -04:00 |
|
Isaac Connor
|
9a3f699644
|
Use a little less ram by passing by reference
|
2020-04-23 16:07:59 -04:00 |
|
Isaac Connor
|
d3f2dd4d6a
|
fix
|
2020-04-23 16:07:23 -04:00 |
|
Isaac Connor
|
7d0421a02c
|
defend against XSS in Monitor Name
|
2020-04-23 16:06:44 -04:00 |
|
Isaac Connor
|
93a37671c2
|
Merge branch 'release-1.34'
|
2020-04-23 16:01:52 -04:00 |
|
Isaac Connor
|
8e2c76df61
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-04-23 15:59:12 -04:00 |
|
Isaac Connor
|
63aaf76f0d
|
handle a 0 value for scale as the scale to fit value
|
2020-04-23 15:57:42 -04:00 |
|
Isaac Connor
|
6a9a8f1d5f
|
check length of returned tr array to prevent errors in js log
|
2020-04-23 15:55:46 -04:00 |
|
Isaac Connor
|
12252f1f37
|
defend against XSS in Monitor Name
|
2020-04-23 15:54:12 -04:00 |
|
Isaac Connor
|
7347ef4030
|
Handle a zero value for scale
|
2020-04-23 15:52:47 -04:00 |
|
Isaac Connor
|
91b1d7bbeb
|
alter setButtonState to take either an id or an element so that we can log the missing element
|
2020-04-23 15:43:36 -04:00 |
|
Isaac Connor
|
a6f5ae2601
|
fix cyclePlay button not working. Move SetButtonState into skin.js
|
2020-04-23 15:42:30 -04:00 |
|
Isaac Connor
|
96774bd038
|
fix inline javascript in ptz buttons
|
2020-04-23 15:39:31 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -04:00 |
|
Isaac Connor
|
264ba6525b
|
Remove debug
|
2020-04-21 12:19:18 -04:00 |
|
Isaac Connor
|
74e5cc3066
|
eslint
|
2020-04-10 14:22:44 -04:00 |
|
Isaac Connor
|
365f0240ad
|
fix inline javascript in ptz buttons
|
2020-04-10 11:30:30 -04:00 |
|
Isaac Connor
|
105be40ce3
|
fix
|
2020-04-10 11:09:46 -04:00 |
|
Isaac Connor
|
c8128de673
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:39 -04:00 |
|
Isaac Connor
|
e9430d48a7
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:20 -04:00 |
|
Isaac Connor
|
aad0b9362c
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:48 -04:00 |
|
Isaac Connor
|
ea8fe7b9a9
|
check length of returned tr array to prevent errors in js log
|
2020-04-06 11:59:27 -04:00 |
|
Isaac Connor
|
571ff260cc
|
Merge branch 'release-1.34'
|
2020-04-04 16:35:09 -04:00 |
|
Isaac Connor
|
e2cb8a656d
|
change exportEvent to expertEvents
|
2020-04-04 11:53:07 -04:00 |
|
Isaac Connor
|
402c38725b
|
Limit version check popups to once per hour
|
2020-04-04 11:52:40 -04:00 |
|
Isaac Connor
|
87069b99b6
|
Fix inline-script errors on groups page referenced in #2890
|
2020-04-02 14:13:28 -04:00 |
|
Isaac Connor
|
4eed0a9c29
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 14:30:41 -04:00 |
|
Isaac Connor
|
1ab294e291
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 12:43:21 -04:00 |
|
Isaac Connor
|
2bd805c1f1
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-03-24 16:16:32 -04:00 |
|
Isaac Connor
|
5a20ef959f
|
Merge branch 'release-1.34'
|
2020-03-20 11:07:46 -04:00 |
|
Isaac Connor
|
ecaaae90f3
|
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
|
2020-03-20 11:06:01 -04:00 |
|
Isaac Connor
|
f8fa0340fc
|
fix eslint
|
2020-03-14 09:27:07 -04:00 |
|
Isaac Connor
|
9a3127da06
|
Merge branch 'rate_dropdown'
|
2020-03-10 18:47:19 -04:00 |
|
Isaac Connor
|
59bd658a96
|
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
|
2020-03-10 18:46:20 -04:00 |