Isaac Connor
|
855efd57fd
|
Merge pull request #2977 from roddone/fix_events_table_responsive
make events table (events view) responsive
|
2020-07-15 10:44:34 -04:00 |
Romain ODDONE
|
785ab58a80
|
make events table (events view) responsive
|
2020-07-13 11:33:26 +02: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
|
ff265d2f17
|
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
|
2020-07-04 09:00:30 -04:00 |
|
Isaac Connor
|
e2a38268a0
|
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
|
2020-07-04 08:59:41 -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
|
cc0624eb3f
|
Don't allow viewing of monitor setting if monitor permissions are set to View
|
2020-07-03 19:19:13 -04:00 |
|
Isaac Connor
|
1860ad188b
|
Don't allow viewing of zones or zone if Monitor permissions are view
|
2020-07-03 19:18:36 -04:00 |
|
Isaac Connor
|
343d8d832e
|
handle scale values of '' and 'auto'
|
2020-07-03 19:18:05 -04:00 |
|
Isaac Connor
|
2026788e7a
|
Turn close link into a button
|
2020-07-03 19:17:26 -04:00 |
|
Isaac Connor
|
66b155008c
|
Fix scale defaulting to monitor default Scale
|
2020-07-03 19:17:11 -04:00 |
|
Isaac Connor
|
9f821c74f6
|
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
|
2020-07-03 19:16:41 -04:00 |
|
Isaac Connor
|
697f117ecd
|
Make width of content 100% instead of 96%.
|
2020-07-02 17:22:34 -04:00 |
|
Isaac Connor
|
346fe63ef0
|
Add styles for inputs on monitor view
|
2020-06-30 19:19:17 -04:00 |
|
Isaac Connor
|
4d8d926c89
|
minor code updates. Use user_row instead of generic row variable name.
|
2020-06-23 22:19:46 -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 |
|
Isaac Connor
|
93b0552ed7
|
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
|
2020-06-23 22:18:45 -04:00 |
|
Isaac Connor
|
e68bf13a6b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-17 12:50:42 -04:00 |
|
Isaac Connor
|
d3c474fc8b
|
use translate on Show/Hide Zones
|
2020-06-17 12:50:36 -04:00 |
Romain ODDONE
|
dcb77cdaea
|
apply stream scale in zoom coordinates
|
2020-06-17 14:46:10 +02:00 |
Isaac Connor
|
aba403e3f2
|
Correct handling of Transport in onvif results
|
2020-06-16 16:48:17 -04: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
|
0905655377
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 17:08:14 -04:00 |
|
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
|
Isaac Connor
|
14f7e01c00
|
Merge pull request #2942 from roddone/fix_monitors_table_responsive
make monitors table (console view) responsive
|
2020-06-03 15:44:38 -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 |
|
Romain ODDONE
|
8121787ee6
|
make monitors table (console view) responsive
|
2020-05-27 10:08:08 +02:00 |
|
Isaac Connor
|
eb41e4fb39
|
Fix the array for the de-interlacing options
|
2020-05-24 11:09:13 -04:00 |
|
Isaac Connor
|
85e1dcadf4
|
Fix the array for the de-interlacing options
|
2020-05-24 11:07:52 -04:00 |
|
Isaac Connor
|
e72c357fd0
|
Unable to probe should not be fatal
|
2020-05-23 16:13:48 -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
|
23900cbf01
|
fix
|
2020-05-21 13:34:09 -04:00 |
|
Isaac Connor
|
59c08410c1
|
Put the size of SHM in the title of the shm space used element
|
2020-05-21 13:32:33 -04:00 |
|
Isaac Connor
|
ce15e1c921
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-20 09:42:29 -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
|
074e270e79
|
populate network interfaces list, rescan on change.
|
2020-05-19 16:58:26 -04:00 |
|
Isaac Connor
|
cc01a04efc
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-19 16:57: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
|
3c2e26ac32
|
Merge branch 'release-1.34'
|
2020-05-15 16:02:29 -04:00 |