Isaac Connor
|
7146bdd59a
|
IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence
|
2019-10-16 10:08:30 -04:00 |
|
Isaac Connor
|
d145adf9c6
|
set default for V4LCapturePerFrame to 1 instead of null.
|
2019-10-16 10:07:50 -04:00 |
|
Isaac Connor
|
f25a823bc8
|
Fix event => zm_event
|
2019-10-16 08:53:40 -04:00 |
externo6
|
4b71bc75ea
|
Change language to Contains / Not Contains and update perl filter.
|
2019-10-16 00:35:49 +01:00 |
|
Isaac Connor
|
8ee567442e
|
UPdate replay, scale, codec dropdown onchanges
|
2019-10-15 15:04:14 -04:00 |
|
Isaac Connor
|
ee1e12b938
|
Be more robust about returning a Server object when instantiating the default Storage area.
|
2019-10-11 17:29:47 -04:00 |
|
Isaac Connor
|
70396c5897
|
Don't warn about the spaces in the command
|
2019-10-09 13:10:43 -04:00 |
|
Isaac Connor
|
c7f5673b47
|
Make filterFIelds global and give more info in error message
|
2019-10-09 10:30:40 -04:00 |
Isaac Connor
|
b15f7ad47d
|
handle ipv6 in Server->Hostname. Fixes #2713
|
2019-10-09 10:00:13 -04:00 |
|
Isaac Connor
|
1cf034ec5f
|
fix inline js on the back/close button
|
2019-10-08 18:49:29 -04:00 |
|
Isaac Connor
|
d1b086ddc6
|
fix cases of monitor->CanZoom to control->CanZoom
|
2019-10-08 18:49:11 -04:00 |
|
Isaac Connor
|
c15e8eebb2
|
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
|
2019-10-08 18:48:37 -04:00 |
|
Isaac Connor
|
f3f972359b
|
increase width of Zoom, White, Iris controls to fit wider button
|
2019-10-08 18:28:02 -04:00 |
|
Isaac Connor
|
4126554092
|
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
|
2019-10-08 18:07:33 -04:00 |
|
Isaac Connor
|
5040d5b075
|
remove extra (
|
2019-10-05 16:56:05 -04:00 |
|
Isaac Connor
|
b1496643eb
|
fix js error in onvif probe
|
2019-10-03 17:31:10 -04:00 |
|
Isaac Connor
|
5384b9345a
|
fix errors on centos 7 with the functions view
|
2019-10-03 17:30:52 -04:00 |
|
Isaac Connor
|
11fe748154
|
Sort control capabilities by Name instead of Id
|
2019-10-03 17:30:31 -04:00 |
|
Isaac Connor
|
7328eb1979
|
be more robust when sending commands to zmcontrol. Of no commands given don't bother.
|
2019-10-03 17:30:10 -04:00 |
|
Isaac Connor
|
17611f2e4b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 19:38:21 -04:00 |
|
Isaac Connor
|
769717b571
|
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability. Make the clear button use it. …
|
2019-10-02 16:43:08 -04:00 |
|
Isaac Connor
|
95615fee35
|
fix eslint
|
2019-10-02 16:42:50 -04:00 |
|
Isaac Connor
|
6b65e9a60c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 16:41:20 -04:00 |
|
Isaac Connor
|
7b93a445b8
|
Finish updating the linked Monitors dropdown
|
2019-10-02 15:42:56 -04:00 |
|
Isaac Connor
|
e4b5052fb4
|
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
|
2019-10-02 15:39:04 -04:00 |
|
Isaac Connor
|
d02aee64e4
|
Add setting of timezone to Options/Config instead of php.ini
|
2019-10-02 09:07:18 -04:00 |
|
Isaac Connor
|
b4d5d92d86
|
Add some non standard resolutions available on some vivotek cameras
|
2019-09-30 15:06:32 -04:00 |
|
Isaac Connor
|
09efbfb4f1
|
Sort groups
|
2019-09-30 15:02:05 -04:00 |
|
Isaac Connor
|
e37870d983
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-30 14:43:02 -04:00 |
|
Isaac Connor
|
85b16e89b7
|
Fix groups dropdown
|
2019-09-30 14:42:10 -04:00 |
Andrew Bauer
|
90b02beb94
|
fix eslint
|
2019-09-30 09:52:41 -05:00 |
|
Isaac Connor
|
3d6cab8360
|
Must force hash regeneration on login. Old hash may be from different user
|
2019-09-28 17:57:45 -04:00 |
|
Isaac Connor
|
7271151eb0
|
add some more aspect ratios
|
2019-09-28 15:16:25 -04:00 |
|
Isaac Connor
|
0c1635b3b8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-28 14:23:33 -04:00 |
|
Isaac Connor
|
393f0a369c
|
Revamp timeline. Make it handle being full browser width. remove onclicks.
|
2019-09-28 14:23:23 -04:00 |
|
Isaac Connor
|
a2861c1361
|
remove errant (
|
2019-09-28 14:22:40 -04:00 |
|
Isaac Connor
|
ae7644370f
|
quotes
|
2019-09-28 14:14:27 -04:00 |
|
Isaac Connor
|
c24fc6c21f
|
Set Delta to 0 to avoid errors
|
2019-09-28 14:10:11 -04:00 |
|
Isaac Connor
|
deef948964
|
Allow anyone to change their skin
|
2019-09-28 12:58:17 -04:00 |
|
Isaac Connor
|
ec9e94b99d
|
Don't add checkboxes if can't edit groups
|
2019-09-28 12:58:01 -04:00 |
|
Isaac Connor
|
80e3922165
|
add backWindow function to handle back buttons
|
2019-09-28 12:57:43 -04:00 |
|
Isaac Connor
|
7a3134ae5e
|
Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection.
|
2019-09-28 10:26:50 -04:00 |
|
externo6
|
7479d3f1f1
|
Add LIKE and NOT LIKE to filter options
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
|
2019-09-28 13:03:16 +01:00 |
|
Isaac Connor
|
ebcacaa660
|
Use material icons for buttons
|
2019-09-26 16:26:37 -04:00 |
|
Isaac Connor
|
b1bcfe8a9b
|
fix backtrace
|
2019-09-26 16:26:28 -04:00 |
|
Isaac Connor
|
fdaee75310
|
Use material icons for buttons. Hide the stop button because it does nothing.
|
2019-09-26 16:26:18 -04:00 |
|
Isaac Connor
|
e4265bd075
|
spaces
|
2019-09-26 16:13:49 -04:00 |
|
Isaac Connor
|
555f3e9c0d
|
Fix missing semi colon in Content-Security-Policy-Report-Only
|
2019-09-26 13:52:27 -04:00 |
|
Isaac Connor
|
4deea4c6ab
|
code doc
|
2019-09-25 10:35:57 -04:00 |
|
Isaac Connor
|
2b017f782b
|
Fix missing eid= from View All/View Pages links
|
2019-09-25 10:35:41 -04:00 |
|
Isaac Connor
|
bcb8389923
|
spaces
|
2019-09-25 10:16:27 -04:00 |
|
Isaac Connor
|
b936fbac6a
|
Don't import Monitor.php unless we need to
|
2019-09-25 10:16:16 -04:00 |
|
Isaac Connor
|
fe893a4a01
|
Add report-uri to out Content-Security-Policy-Report-Only header
|
2019-09-25 10:16:02 -04:00 |
|
Isaac Connor
|
ca40e760f7
|
get global cspNonce
|
2019-09-25 10:15:32 -04:00 |
|
Isaac Connor
|
54dec069cd
|
correct quotes and use a button on loging page
|
2019-09-25 10:15:12 -04:00 |
|
Isaac Connor
|
1b653e7e79
|
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
|
2019-09-25 10:14:41 -04:00 |
|
Isaac Connor
|
5c80e098c5
|
Only save Group changes if there were changes
|
2019-09-25 10:14:12 -04:00 |
|
Isaac Connor
|
475432449f
|
Add default values for Status record
|
2019-09-25 10:13:56 -04:00 |
|
Isaac Connor
|
afd10e49d6
|
spaces, quotes extra braces
|
2019-09-25 10:13:32 -04:00 |
|
Isaac Connor
|
d16d77d6b3
|
quotes and spacing
|
2019-09-23 12:39:24 -04:00 |
|
Isaac Connor
|
a05c513643
|
Revert change breaking multiport when servers not defined.
|
2019-09-23 12:03:19 -04:00 |
|
Isaac Connor
|
c7d7d45380
|
Remove :'s, they can be added using css if desired
|
2019-09-23 11:49:39 -04:00 |
|
Isaac Connor
|
538478ff1c
|
Need to -1 on the dimensions when comparing to points as they are 0-based
|
2019-09-23 11:48:58 -04:00 |
|
Isaac Connor
|
1dd09923eb
|
Add special case for just rotating the monitor dimensions and add out of bounds check for zone points
|
2019-09-23 11:42:49 -04:00 |
|
Isaac Connor
|
9a94ce6e41
|
remove debug
|
2019-09-23 10:22:25 -04:00 |
|
Isaac Connor
|
23b3ae5783
|
Remove debug
|
2019-09-22 21:06:54 -04:00 |
|
Isaac Connor
|
8d95b2f5f8
|
Don't select Layout when changing size in montage
|
2019-09-22 14:22:24 -04:00 |
|
Isaac Connor
|
4c3ea7125d
|
Add defaults to Frame
|
2019-09-22 14:21:59 -04:00 |
|
Isaac Connor
|
7b9eaf42b8
|
Fix selecting group from groups listing under monitor name. Fixes #2711
|
2019-09-22 12:03:34 -04:00 |
|
Isaac Connor
|
8226e3c233
|
Update hebrew language
|
2019-09-22 12:02:31 -04:00 |
|
Isaac Connor
|
6d16363f07
|
Restore monitor defaults
|
2019-09-21 10:40:24 -04:00 |
|
Isaac Connor
|
d7810bf9b3
|
fix eslint
|
2019-09-20 14:16:37 -04:00 |
|
Isaac Connor
|
6c39fd133d
|
fix eslint
|
2019-09-20 10:44:38 -04:00 |
Isaac Connor
|
5d0b4942d6
|
remove debug
|
2019-09-20 10:37:48 -04:00 |
|
Isaac Connor
|
0d19b0dc85
|
Use a subselect instead of inner join because the inner join won't return monitors that don't have a group
|
2019-09-20 10:37:19 -04:00 |
|
Isaac Connor
|
a8cbe7d10d
|
Turn off debug
|
2019-09-20 10:36:50 -04:00 |
|
Isaac Connor
|
481f5b7eac
|
Update control ajax
|
2019-09-20 10:36:38 -04:00 |
|
Isaac Connor
|
308236b4ad
|
Fix sending ptz controls
|
2019-09-20 10:35:39 -04:00 |
|
Isaac Connor
|
0a0bb1b326
|
Update Frame and Server Objects to use common methods
|
2019-09-19 16:24:05 -04:00 |
|
Isaac Connor
|
d4435368bc
|
fix spacing between presets and home/set
|
2019-09-19 14:57:48 -04:00 |
|
Isaac Connor
|
1539e34204
|
spacing
|
2019-09-19 14:57:28 -04:00 |
|
Isaac Connor
|
b05ecd881e
|
add onchange to scale
|
2019-09-19 14:57:21 -04:00 |
|
Isaac Connor
|
2da9edf0ff
|
add onchange to scale
|
2019-09-19 14:57:17 -04:00 |
|
Isaac Connor
|
14e625b775
|
Set width of dimensions
|
2019-09-19 14:56:55 -04:00 |
|
Isaac Connor
|
daa9f646fb
|
fix error printing
|
2019-09-19 14:56:34 -04:00 |
|
Isaac Connor
|
b9b52c964e
|
Upgrade monitor saving and viewing
|
2019-09-19 14:56:16 -04:00 |
|
Isaac Connor
|
73a5a8c8c5
|
Improve changes/set/etc to handle more complex defaults
|
2019-09-19 14:55:45 -04:00 |
|
Isaac Connor
|
b41e998a3a
|
Remove Control stuff from Monitor
|
2019-09-19 14:55:27 -04:00 |
|
Isaac Connor
|
4c206c2e9a
|
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
|
2019-09-19 14:55:17 -04:00 |
|
Isaac Connor
|
d5ee73a9ee
|
use CaptureResolution instead of CaptureDimensions because it is already in language
|
2019-09-19 10:50:20 -04:00 |
|
Isaac Connor
|
1bd70319a9
|
Add a dimensions dropdown to ease entering monitor dimensions
|
2019-09-19 10:48:25 -04:00 |
|
Isaac Connor
|
2caca5f3ad
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:41:16 -04:00 |
|
Isaac Connor
|
9889311b03
|
Handle username=&password= as well in HostController::login
|
2019-09-18 11:40:55 -04:00 |
|
Isaac Connor
|
458268d866
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:40:09 -04:00 |
|
Isaac Connor
|
b3b7ec660b
|
Add a test for the built-in layouts. Can't edit them.
|
2019-09-18 11:19:28 -04:00 |
|
Isaac Connor
|
9e8c17dfaf
|
Merge branch 'master' into tolland-remove-extra-px
|
2019-09-18 11:17:50 -04:00 |
|
Isaac Connor
|
0eb1fff5b5
|
remove unused view=image-ffmpeg
|
2019-09-18 11:16:49 -04:00 |
|
Isaac Connor
|
f509b4c9d1
|
spacing
|
2019-09-18 11:10:40 -04:00 |
|
Isaac Connor
|
1407d849e8
|
deprecate getStreamSrc in functions.php.
|
2019-09-18 11:10:25 -04:00 |
|
Isaac Connor
|
ce1823bd29
|
spacing and fix saving
|
2019-09-17 12:46:11 -04:00 |