Isaac Connor
|
04b3f5d294
|
Merge branch 'master' into improve_zone_editing
|
2020-08-28 09:43:48 -04:00 |
Andrew Bauer
|
2b6090d8c6
|
console.js - change all createPopup to window.location.assign
|
2020-08-28 07:58:42 -05:00 |
|
Andrew Bauer
|
1e78307735
|
add navigation buttons to monitor view
|
2020-08-27 16:30:49 -05:00 |
|
Isaac Connor
|
dc15663030
|
Fix scales after applying layout
|
2020-08-27 10:55:14 -04:00 |
|
Isaac Connor
|
4c1446d856
|
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
|
2020-08-27 10:33:08 -04:00 |
|
Andrew Bauer
|
8d202aeef0
|
eslint
|
2020-08-26 15:36:38 -05:00 |
|
Isaac Connor
|
ab68bef39a
|
Merge branch 'master' into filter_pre_post
|
2020-08-26 15:28:48 -04:00 |
|
Isaac Connor
|
0ced21dda7
|
Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
|
2020-08-26 15:15:57 -04:00 |
|
Isaac Connor
|
74d2ba56db
|
Persist video volume in a cookie so that subsequent events remember the volume level.
|
2020-08-26 15:15:10 -04:00 |
|
Isaac Connor
|
24d1ba3a00
|
fix eslint
|
2020-08-26 13:41:40 -04:00 |
|
Andrew Bauer
|
ac7867eab3
|
make function view a modal
|
2020-08-26 11:39:48 -05:00 |
|
Isaac Connor
|
e3a48c2db4
|
Handle the case where the layout has invalid json
|
2020-08-25 12:07:45 -04:00 |
|
Isaac Connor
|
6fbe7457ff
|
Add missing globals
|
2020-08-25 11:47:49 -04:00 |
|
Isaac Connor
|
626e892b33
|
add global
|
2020-08-25 11:43:55 -04:00 |
|
Andrew Bauer
|
0879ecf9a5
|
update timeline header
|
2020-08-24 14:33:01 -05:00 |
|
Andrew Bauer
|
8c32511c83
|
whitespace
|
2020-08-24 12:05:31 -05:00 |
|
Andrew Bauer
|
e5e2c3b347
|
fix stats off by 1 frame, don't alert on score 0
|
2020-08-24 10:57:54 -05:00 |
|
Andrew Bauer
|
c6e3107a50
|
make donate view a modal
|
2020-08-24 09:31:21 -05:00 |
|
Isaac Connor
|
0f27243007
|
Merge branch 'master' into filter_pre_post
|
2020-08-24 09:23:24 -04:00 |
Andrew Bauer
|
8ea806e264
|
eslint
|
2020-08-23 18:40:58 -05:00 |
|
Andrew Bauer
|
699b20b961
|
whitespace
|
2020-08-23 17:54:57 -05:00 |
|
Andrew Bauer
|
65181c84ee
|
update frame top toolbar
|
2020-08-23 17:53:47 -05:00 |
|
Andrew Bauer
|
86f0d41d8e
|
autoinit changeScale in frame view
|
2020-08-23 13:17:03 -05:00 |
|
Andrew Bauer
|
4b144dea74
|
whitespace
|
2020-08-23 13:02:35 -05:00 |
|
Andrew Bauer
|
f06bfe7cbb
|
use bootstrap-table on stats view
|
2020-08-23 12:23:58 -05:00 |
|
Andrew Bauer
|
69ba9e6d0e
|
eslint
|
2020-08-23 12:14:09 -05:00 |
|
Isaac Connor
|
2a7ea52330
|
Merge branch 'release-1.34'
|
2020-08-23 11:51:54 -04:00 |
|
Andrew Bauer
|
de1d1c2ac6
|
change close link to back link
|
2020-08-22 14:43:53 -05:00 |
|
Andrew Bauer
|
61f89e3306
|
rough in frames detail view
|
2020-08-22 12:45:19 -05:00 |
|
Andrew Bauer
|
73a01855f8
|
rough in thumbnail animation
|
2020-08-21 20:44:20 -05:00 |
|
Isaac Connor
|
ac0976324f
|
Fix case of filterQuery. Fixes #3017
|
2020-08-21 11:22:47 -04:00 |
|
Andrew Bauer
|
9357017a39
|
add export fx to tables
|
2020-08-21 07:11:57 -05:00 |
|
Andrew Bauer
|
de4d144cd4
|
fix scale dropdown in frame view
|
2020-08-20 10:16:28 -05:00 |
|
Andrew Bauer
|
247ace7fa2
|
process clicks per cell in frames
|
2020-08-20 09:13:11 -05:00 |
|
Andrew Bauer
|
c9de30d427
|
click any row to load frame
|
2020-08-19 17:54:39 -05:00 |
|
Andrew Bauer
|
b2a632a3f8
|
reinit thumbnail ani on click events
|
2020-08-19 16:16:27 -05:00 |
|
Andrew Bauer
|
8f70ae192d
|
enable thumbnail zoom on frames view
|
2020-08-19 15:42:35 -05:00 |
|
Andrew Bauer
|
a903a885b6
|
whitepsace
|
2020-08-19 14:07:00 -05:00 |
|
Isaac Connor
|
c2d6b8f493
|
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
|
2020-08-19 14:39:15 -04:00 |
|
Isaac Connor
|
d0c21995cd
|
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
|
2020-08-19 14:14:32 -04:00 |
|
Isaac Connor
|
efec1e7d4f
|
remove debug
|
2020-08-19 14:13:48 -04:00 |
|
Andrew Bauer
|
f317bf1722
|
fix copy/paste typo
|
2020-08-19 12:07:31 -05:00 |
|
Andrew Bauer
|
e38a532b78
|
rough new frames view
|
2020-08-19 12:04:08 -05:00 |
|
Andrew Bauer
|
ad9b9d91cc
|
disable the back button when new page
|
2020-08-18 16:57:03 -05:00 |
|
Isaac Connor
|
b38c5e98a8
|
Merge branch 'master' into filter_pre_post
|
2020-08-18 16:33:04 -04:00 |
|
Andrew Bauer
|
1e41bd0823
|
whitespace
|
2020-08-18 13:48:18 -05:00 |
|
Andrew Bauer
|
df02d84a56
|
don't go back if not referred
|
2020-08-18 13:08:17 -05:00 |
|
Andrew Bauer
|
2c9caeb348
|
whitespace
|
2020-08-18 12:40:27 -05:00 |
|
Isaac Connor
|
2d5522df14
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-18 13:25:21 -04:00 |
|
Isaac Connor
|
c837a17aea
|
Add a warning about missing EndTime term on UpdateDiskSpace
|
2020-08-18 13:25:18 -04:00 |
|
Andrew Bauer
|
bf63500b08
|
fix thumbnail animation after user event
|
2020-08-18 12:00:20 -05:00 |
|
Isaac Connor
|
e6d6ee1b67
|
Merge branch 'filter_warnings'
|
2020-08-18 11:17:46 -04:00 |
|
Isaac Connor
|
16efa9dbb2
|
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
|
2020-08-18 11:17:22 -04:00 |
|
Andrew Bauer
|
287c585d3d
|
use translated text for delete confirmation
|
2020-08-18 08:26:45 -05:00 |
|
Andrew Bauer
|
b32bcab91f
|
add a delete confirmation modal
|
2020-08-18 08:06:58 -05:00 |
|
Isaac Connor
|
0a3ad719cd
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 18:30:44 -04:00 |
|
Andrew Bauer
|
1dd0b44334
|
eslint nanny strikes again
|
2020-08-17 16:59:57 -05:00 |
|
Isaac Connor
|
e3fe75f21b
|
fix case on filterQuery
|
2020-08-17 17:42:03 -04:00 |
|
Andrew Bauer
|
80b92573b8
|
set the icons used in bstable toolbar
|
2020-08-17 16:18:18 -05:00 |
|
Isaac Connor
|
e4425d7565
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 12:56:20 -04:00 |
|
Isaac Connor
|
1a6154752a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-16 20:08:49 -04:00 |
|
Isaac Connor
|
a8455d4ecf
|
Add necessary globals
|
2020-08-16 20:08:42 -04:00 |
|
Andrew Bauer
|
5468c0322e
|
appease the eslint nanny
|
2020-08-16 16:30:35 -05:00 |
|
Andrew Bauer
|
0cbf559821
|
only hide cols if cookie not exist
|
2020-08-16 16:02:43 -05:00 |
|
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 |
|
Isaac Connor
|
77c391fcae
|
Add booleanvalues for operators support
|
2020-08-16 13:07:42 -04:00 |
|
Isaac Connor
|
77f9f4bffb
|
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
|
2020-08-16 13:07:21 -04: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 |
|
Isaac Connor
|
f22f3e9262
|
use a scaled svg and replace inline js
|
2020-07-13 14:51:07 -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 |
|
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
|
Isaac Connor
|
e8553babfa
|
remove extra spaces, fix eslint
|
2020-03-09 14:43:54 -04:00 |
|
Isaac Connor
|
55f63e8e9d
|
Merge branch 'fix_auth_timeouts'
|
2020-03-04 11:22:08 -05:00 |
|
Isaac Connor
|
a9e3d0691f
|
quotes, fix status ajax call using old auth_hash
|
2020-03-04 11:17:48 -05:00 |
|
Isaac Connor
|
a2dd24ae1f
|
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
|
2020-03-02 14:38:36 -05:00 |
|
Isaac Connor
|
00de49a5c1
|
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
|
2020-03-02 12:43:07 -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
|
b9acf42929
|
spacing, eslint
|
2020-02-29 09:28:04 -05:00 |
|
Isaac Connor
|
bf9ba39aa2
|
Merge branch 'release-1.34'
|
2020-02-25 18:22:55 -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
|
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
|
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
|
dce4d17b51
|
fix cyclePlay button not working. Move SetButtonState into skin.js
|
2020-02-25 13:17:02 -05:00 |
|
Isaac Connor
|
a7c28be365
|
change scale to fit value from auto to 0
|
2020-02-25 12:14:34 -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 |
|
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
|
dab5c520fe
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-02-19 14:20:08 -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
|
52dfbc92e9
|
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
|
2020-01-24 11:10:02 -05:00 |
|
Isaac Connor
|
29a04dc1b9
|
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
|
2020-01-24 09:50:53 -05:00 |
|
Isaac Connor
|
948b3d7e43
|
Impleent click_AutoEmail to hide/show the Email options
|
2020-01-22 17:02:16 -05:00 |
|
Isaac Connor
|
9d41334e8f
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-01-22 13:45:37 -05:00 |
|
Isaac Connor
|
dbdb13efd7
|
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
|
2020-01-20 11:02:43 -05:00 |
Garrett Scott
|
ead52f30b1
|
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
|
2020-01-20 00:44:20 -08:00 |
|
Andrew Bauer
|
de5bf21d8a
|
fix eslint
|
2020-01-17 15:06:46 -06:00 |
|
Isaac Connor
|
d0003215b1
|
Merge branch 'master' into rate_dropdown
|
2020-01-17 12:30:35 -05:00 |
|
Isaac Connor
|
a398f33e68
|
fix delTerm button not being enabled because it is a button now, not an input
|
2020-01-17 09:17:29 -05:00 |