Isaac Connor
|
576dd23907
|
test for existence of filter in query
|
2019-12-02 12:30:15 -05:00 |
|
Isaac Connor
|
355fceccb4
|
test for existence of default
|
2019-12-02 12:30:03 -05:00 |
|
Isaac Connor
|
caefcc2f7a
|
increase size of export popup
|
2019-12-02 12:17:33 -05:00 |
|
Isaac Connor
|
03d7bcdd11
|
better debug logging when on-click-this function isn't defined
|
2019-12-02 12:17:18 -05:00 |
Isaac Connor
|
c19632e114
|
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
Fix api alarm auth
|
2019-12-02 07:53:50 -05:00 |
|
Isaac Connor
|
76d795f413
|
add rendering of enums for Events Controller
|
2019-12-01 12:32:14 -05:00 |
|
Isaac Connor
|
0b2853095e
|
cleanup auth in monitors alarm method
|
2019-12-01 12:30:27 -05:00 |
Isaac Connor
|
eedb31730e
|
fix saving Monitor values that don't get passed when empty, like Enabled
|
2019-11-29 14:49:43 -05:00 |
|
Isaac Connor
|
cab1056328
|
improve debugging in recursive_array_diff
|
2019-11-29 14:49:10 -05:00 |
|
Isaac Connor
|
393c25b4f2
|
fix array keys
|
2019-11-29 14:26:03 -05:00 |
|
Isaac Connor
|
d6a414a1a4
|
Merge pull request #2767 from connortechnology/fix_2692
Fix 2692
|
2019-11-29 14:24:00 -05:00 |
|
Isaac Connor
|
29572abef2
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:56:02 -05:00 |
|
Isaac Connor
|
a9d8e73f68
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:53:46 -05:00 |
|
Isaac Connor
|
7e92900542
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:50:02 -05:00 |
|
Isaac Connor
|
4817efe17c
|
Add enum support for Orientation and Scheme to Events
|
2019-11-29 13:48:20 -05:00 |
|
Isaac Connor
|
d02e30ceca
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:48:02 -05:00 |
Pliable Pixels
|
7b99c89541
|
its not necessary the token is a refresh. Can also be empty
|
2019-11-26 20:57:25 -05:00 |
|
Isaac Connor
|
54a15573ad
|
Make 32bit the default for COlours
|
2019-11-26 15:06:24 -05:00 |
|
Isaac Connor
|
5ebf929598
|
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
|
2019-11-26 14:36:39 -05:00 |
|
Isaac Connor
|
ab9f99bdbb
|
Fix Width & Height rotation when scaling. Fixes #2760
|
2019-11-22 12:18:30 -05:00 |
|
Isaac Connor
|
1dc83700c0
|
Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url()
|
2019-11-21 13:32:27 -05:00 |
|
Isaac Connor
|
606c89962f
|
eliminate an extra db call
|
2019-11-20 16:30:26 -05:00 |
|
Isaac Connor
|
9d4c802b48
|
netEmpty is deprecated. Use notBlank instead
|
2019-11-20 09:32:19 -05:00 |
|
Isaac Connor
|
5feeedf7f4
|
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
|
2019-11-20 09:31:58 -05:00 |
|
Isaac Connor
|
5494fdb087
|
When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's
|
2019-11-20 09:31:16 -05:00 |
|
Isaac Connor
|
ac96a19371
|
Fix filtering monitors by user's MonitorId restriction
|
2019-11-19 17:21:01 -05:00 |
|
Isaac Connor
|
207e5918c8
|
fix lint, remove debug
|
2019-11-19 11:37:45 -05:00 |
|
Isaac Connor
|
59b9220ddd
|
if doing multiport still call Url(), as it requires a hostname
|
2019-11-11 13:33:54 -05:00 |
|
Isaac Connor
|
56618aac32
|
Handle buttons not existing
|
2019-11-10 15:49:39 -05:00 |
|
Isaac Connor
|
1c54f22627
|
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
|
2019-11-08 15:18:08 -05:00 |
|
Isaac Connor
|
014ce0afe8
|
improve error message regarding timezone differences
|
2019-11-05 12:40:11 -05:00 |
|
Isaac Connor
|
5b02bc76f4
|
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
|
2019-11-05 10:07:42 -05:00 |
|
Isaac Connor
|
5603fd70f8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-11-04 12:04:37 -05:00 |
|
Isaac Connor
|
d218d2ee9f
|
If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750
|
2019-11-04 12:04:23 -05:00 |
|
Isaac Connor
|
4e16e9052a
|
Merge pull request #2749 from pliablepixels/monitor_add_validation
add model validation so that we don't create empty monitors
|
2019-11-02 10:16:41 -04:00 |
|
Isaac Connor
|
9d8a230252
|
Prevent deletion of entire events directory when monitor has empty name
|
2019-11-02 10:12:43 -04:00 |
|
Pliable Pixels
|
16a6938710
|
add model validation so that we don't create empty monitors
|
2019-11-02 08:30:25 -04:00 |
|
Isaac Connor
|
54c11bc0d1
|
define monitor_options as an empty array instead of php implicitly dealing with it
|
2019-11-01 13:42:01 -04:00 |
|
Isaac Connor
|
a20517a6db
|
spacing
|
2019-11-01 13:41:37 -04:00 |
|
Isaac Connor
|
18c13c4bad
|
Make chosen dropdowns 100% width on monitor edit
|
2019-11-01 13:40:55 -04:00 |
|
Isaac Connor
|
eea4cf0924
|
add ParentGroup to language
|
2019-11-01 13:40:20 -04:00 |
|
Isaac Connor
|
968c28395d
|
close group popup when saving
|
2019-11-01 13:39:40 -04:00 |
|
Isaac Connor
|
9a3bee28d2
|
add logging and handling of oninput and oninput-this
|
2019-11-01 13:38:09 -04:00 |
|
Isaac Connor
|
3653ad5ce3
|
update group editing, solving inline javascript problems and removing cruft
|
2019-11-01 13:37:52 -04:00 |
|
Isaac Connor
|
e0d085d187
|
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
|
2019-10-30 16:57:45 -04:00 |
|
Isaac Connor
|
6ae220f756
|
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
|
2019-10-29 18:06:32 -04:00 |
|
Isaac Connor
|
daf71aa492
|
improvements to layout on zones and zone
|
2019-10-29 18:06:03 -04:00 |
|
Isaac Connor
|
988b2183c3
|
use new ViewWIdth and ViewHeight functions to generate video stream.
|
2019-10-29 17:42:48 -04:00 |
|
Isaac Connor
|
eb2269ea52
|
improve zone saving testing for value before doing math
|
2019-10-29 17:42:23 -04:00 |
|
Isaac Connor
|
f2300f2e8c
|
Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing
|
2019-10-29 17:39:12 -04:00 |
|
Isaac Connor
|
417123019c
|
fix crumbs
|
2019-10-23 09:52:36 -04:00 |
|
Isaac Connor
|
77118d55b2
|
add 4CIF aspect ratio padding. Fixes #2738
|
2019-10-23 09:50:49 -04:00 |
|
Isaac Connor
|
d036613776
|
Fix Server() not returning a ServerObject if not found when ServerId is null or 0
|
2019-10-21 13:45:27 -04:00 |
|
Isaac Connor
|
91651652c7
|
Only report an error for not finding the server if ServerId had a value
|
2019-10-21 13:41:32 -04:00 |
|
Isaac Connor
|
12dfcae81f
|
remove debug
|
2019-10-21 13:19:20 -04:00 |
|
Isaac Connor
|
3244c8ab5b
|
spacing, quotes, remove debug
|
2019-10-21 13:18:09 -04:00 |
|
Isaac Connor
|
6a3fe1ef1f
|
actually set date.timezone from ZM_TIMEZONE
|
2019-10-18 14:37:09 -04:00 |
|
Isaac Connor
|
1a417952c3
|
AutoStopTimeOut is part of Monitor, not Control
|
2019-10-18 14:19:25 -04:00 |
|
Isaac Connor
|
13b02284fe
|
Merge branch 'master' into timezone_as_config
|
2019-10-18 13:58:22 -04:00 |
|
Isaac Connor
|
a6a61b75b9
|
update ptz css in classic
|
2019-10-18 13:52:34 -04:00 |
|
Isaac Connor
|
524a39a224
|
changeCodec no longer needs to be passed this
|
2019-10-18 13:40:29 -04:00 |
|
Isaac Connor
|
1abdf25ad3
|
Merge pull request #2727 from externo6/align_filter_options
align with other filter options
|
2019-10-17 10:22:01 -04:00 |
externo6
|
9068cb1a19
|
align with other filter options
|
2019-10-17 10:17:22 +01:00 |
|
Isaac Connor
|
fdf48c4123
|
Merge pull request #2726 from externo6/more-filter-options
More filter options
|
2019-10-16 10:15:58 -04:00 |
|
Isaac Connor
|
ebebcad10d
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-10-16 10:13:31 -04:00 |
|
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 |