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
|
c47a348fea
|
Handle empty string version of scale
|
2020-06-30 19:18:45 -04:00 |
|
Isaac Connor
|
b060e0835c
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-06-25 16:07:22 -04:00 |
|
Isaac Connor
|
13130a844e
|
handle array args in daemonStatus
|
2020-06-25 16:07:16 -04:00 |
|
Isaac Connor
|
0a383c02c4
|
Better debugging of REQUEST/POST vars
|
2020-06-23 22:20:07 -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
|
f73cb3bebe
|
Don't start filter if the command was execute
|
2020-06-17 13:36:28 -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 |
|
Isaac Connor
|
8efe00157d
|
add a User object
|
2020-06-17 12:50:22 -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
|
a719565bf3
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 19:03:23 -04:00 |
|
Isaac Connor
|
198790796d
|
Merge branch 'release-1.34'
plus cleanups in dbConnect
|
2020-06-05 19:02:43 -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
|
910d4b51c9
|
Escape table names for mysql-8
|
2020-06-04 11:44:59 -04:00 |
|
Isaac Connor
|
8802447b10
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:36:10 -04:00 |
|
Isaac Connor
|
ef3fc758cb
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-04 11:34:48 -04:00 |
|
Isaac Connor
|
c4b2aa4a85
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:34:16 -04:00 |
|
Isaac Connor
|
87078dfc31
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-03 17:41:09 -04:00 |
|
Isaac Connor
|
0644358d0a
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-03 17:41:03 -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
|
d7680e1a44
|
Spacing
|
2020-05-23 10:15:48 -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 |
|
Isaac Connor
|
4dc693022e
|
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
|
2020-05-15 16:02:19 -04:00 |
|
Isaac Connor
|
6bb2c09a72
|
Merge branch 'release-1.34'
|
2020-05-15 11:41:34 -04:00 |
|
Isaac Connor
|
c4c4c5bcbf
|
fix Crud submodule version
|
2020-05-15 11:34:34 -04:00 |
|
Isaac Connor
|
424a4ed0b1
|
add onclick to div.zoom
|
2020-05-15 11:34:23 -04:00 |
|
Isaac Connor
|
0dd426d64c
|
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
|
2020-05-15 11:33:10 -04:00 |
|
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Isaac Connor
|
992ac144a9
|
Fix ONVIF_User => ONVIF_Username
|
2020-05-13 16:04:26 -04:00 |
|
Isaac Connor
|
880b456d93
|
Rrename MetaConfig to ONVIF
|
2020-05-13 15:30:56 -04:00 |
|
Isaac Connor
|
88a910793c
|
Spacing
|
2020-05-13 08:06:55 -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
|
69e5feb28b
|
Add ONVIF* to Monitor object
|
2020-05-12 15:47:00 -04:00 |
|
Isaac Connor
|
c83621822f
|
Rename Config* to ONVIF_*
|
2020-05-12 15:46:07 -04:00 |
|
Isaac Connor
|
1f3cf266a2
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
|
2020-05-12 11:20:49 -04:00 |
|
Isaac Connor
|
89939efc9b
|
Fixup my updates to the MetaConfig tab of monitor view
|
2020-05-12 11:15:29 -04:00 |
|
Isaac Connor
|
3f50277e1c
|
Revert effort to escape column names. Not smart enough.
|
2020-05-12 09:21:05 -04:00 |
|
Isaac Connor
|
eadff23465
|
Fix missing )
|
2020-05-12 09:16:37 -04:00 |
|
Isaac Connor
|
c5f082e7ac
|
fix escaping column names
|
2020-05-12 09:06:57 -04:00 |
|
Isaac Connor
|
92ba017328
|
Spacing
|
2020-05-11 09:19:33 -04:00 |
|
Isaac Connor
|
582102c2c6
|
Fix use of backticks for newer mysql
|
2020-05-11 09:19:16 -04:00 |
|
Isaac Connor
|
81cd338545
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-05-11 08:34:19 -04:00 |
|
Isaac Connor
|
d23258cb23
|
Allow for backticks in sort column
|
2020-05-11 08:34:07 -04:00 |
|
Isaac Connor
|
75082064fd
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
|
2020-05-09 16:40:17 -04:00 |
|
Isaac Connor
|
732bb5416f
|
Merge branch 'master' into onvif_updated
|
2020-05-09 16:26:29 -04:00 |
|
Isaac Connor
|
408da1be27
|
Merge branch 'release-1.34'
|
2020-05-08 18:46:19 -04:00 |
|
Isaac Connor
|
24c09a8207
|
Accept 0 as a value for scale meaning scale to fit
|
2020-05-08 17:55:12 -04:00 |
|
Isaac Connor
|
8195223a86
|
merge some php
|
2020-05-08 17:54:51 -04:00 |
|
Isaac Connor
|
f1d794c11b
|
spacing and escape sql fields
|
2020-05-07 13:57:37 -04:00 |
|
Isaac Connor
|
d71de221ae
|
If auth is turned on, add a UserId dropdown to filters
|
2020-05-07 11:00:50 -04:00 |
|
Isaac Connor
|
e01538419f
|
Add FilterUser to language
|
2020-05-07 10:59:50 -04:00 |
|
Isaac Connor
|
a9a490126a
|
Add UserId to Filter object
|
2020-05-07 10:59:32 -04:00 |
|
Isaac Connor
|
5a15701873
|
remove annoying ()
|
2020-05-05 18:07:28 -04:00 |
Pliable Pixels
|
dadcea4884
|
remove recursive from index
|
2020-05-05 16:35:14 -04:00 |
|
Pliable Pixels
|
0817ea3bfb
|
added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group
|
2020-05-05 16:32:54 -04:00 |
|
Isaac Connor
|
28a3691b9c
|
Merge branch 'release-1.34'
|
2020-05-01 19:46:38 -04:00 |
|
Isaac Connor
|
c99db3a03f
|
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
|
2020-05-01 18:47:10 -04:00 |
|
Isaac Connor
|
0085e3d34f
|
Don't warn about image for WebSite Monitors
|
2020-05-01 18:15:19 -04:00 |
|
Isaac Connor
|
683bf3f982
|
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
|
2020-05-01 15:32:54 -04:00 |
|
Isaac Connor
|
9dbeaa2c7b
|
Add default for Orientation. Fixes saving WebSite type monitors
|
2020-05-01 15:32:26 -04:00 |
|
Isaac Connor
|
1bd340d602
|
spacing in watch.php
|
2020-05-01 13:30:00 -04:00 |
|
Isaac Connor
|
6dbc917215
|
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
|
2020-05-01 13:24:47 -04:00 |
|
Isaac Connor
|
82188c266e
|
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
|
2020-05-01 13:23:39 -04:00 |
|
Isaac Connor
|
45a445ac48
|
sync up index.php to master, where is a global
|
2020-05-01 13:21:02 -04:00 |