Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -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
|
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
|
e56976c800
|
Triggers cannot be null, it is '' instead
|
2020-03-08 17:23:48 -04:00 |
|
Isaac Connor
|
bd59ae8856
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 15:00:31 -05:00 |
|
Isaac Connor
|
76131d1887
|
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
|
2020-03-01 11:07:31 -05:00 |
|
Isaac Connor
|
1b70ed2076
|
Merge branch 'fix_generate_video_page' into release-1.34
|
2020-02-25 18:22:24 -05:00 |
|
Isaac Connor
|
0c70c5c2a4
|
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
|
2020-02-25 18:14:27 -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
|
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
|
173d58d8b3
|
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
Event list is not filtered when group is selected on console
|
2020-02-24 14:37:42 -05:00 |
|
Isaac Connor
|
55c99c5ff3
|
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
|
2020-02-24 14:34:21 -05:00 |
|
Isaac Connor
|
d0a8d241d2
|
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
|
2020-02-24 13:13:54 -05:00 |
|
Isaac Connor
|
d7f8f201be
|
Fix zoneminder.com url getting undefined being added to it
|
2020-02-22 10:51:26 -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 |
zlodag
|
a8615c1c85
|
fixed bug in control functions where left arrow panStep was inverted
|
2020-02-16 11:41:14 +13:00 |
|
Isaac Connor
|
289bde869d
|
use a better language for unset value
|
2020-02-11 14:31:48 -05:00 |
|
Isaac Connor
|
9f9a97f596
|
fix dropdown with unset option
|
2020-02-11 14:29:21 -05:00 |
|
Isaac Connor
|
844ff529e1
|
add an unset value to ZM_TIMEZONE in Options->System
|
2020-02-11 13:24:26 -05:00 |
|
Isaac Connor
|
137bdb1f24
|
Make shm have error or warning class if full
|
2020-02-10 14:20:46 -05:00 |
|
Isaac Connor
|
42b3bb6a53
|
increase width of google sitekey and secret key inputs to 100%
|
2020-02-04 16:40:52 -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 |
|
Isaac Connor
|
75fa1d693d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-18 16:09:44 -05:00 |
|
Isaac Connor
|
6c7f003198
|
revert bogus change not including skin.js
|
2020-01-18 16:08:55 -05:00 |
Andrew Bauer
|
de5bf21d8a
|
fix eslint
|
2020-01-17 15:06:46 -06:00 |
|
Isaac Connor
|
5b8e5eb349
|
don't output duplicated js when css=base
|
2020-01-17 14:51:02 -05: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 |
|
Isaac Connor
|
4f2df830a8
|
fix inline js
|
2020-01-17 09:17:05 -05:00 |
|
Isaac Connor
|
74b3ad6dd9
|
add options help for HWACCEL options
|
2020-01-16 14:33:37 -05:00 |
|
Isaac Connor
|
6a43c2deb5
|
fix zoom_range to zoomout_range
|
2020-01-16 14:17:40 -05:00 |
|
Isaac Connor
|
09f2298838
|
return empty array instead of nothing in probeNetwork
|
2020-01-15 19:02:40 -05:00 |
|
Isaac Connor
|
91acb775eb
|
Fix Eventount to EventCount
|
2020-01-13 13:43:14 -05:00 |
|
Isaac Connor
|
b11815cfa9
|
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
|
2020-01-13 12:53:50 -05:00 |
PrplHaz4
|
6a4b66a792
|
add 3840x2160 4k UHD to monitor dropdown
I think this is fairly common in consumer IP cams now...
|
2020-01-10 19:44:06 -05:00 |
Alex Porosanu
|
28a4bef6ba
|
fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
|
2020-01-09 22:03:02 +02:00 |
|
Andrew Bauer
|
f13a7199e1
|
fix eslint
|
2020-01-07 21:53:55 -06:00 |
|
Isaac Connor
|
c64de372a7
|
when auth_hash changes, update various CmdParms
|
2020-01-07 17:08:57 -05:00 |
|
Isaac Connor
|
1c197db619
|
Merge branch 'master' into rate_dropdown
|
2020-01-07 14:49:58 -05:00 |
|
Isaac Connor
|
61bc0ddd0a
|
add missing t and merge some lines
|
2020-01-07 11:01:53 -05:00 |
|
Isaac Connor
|
2f1b725ee4
|
quote SQL for mysql8
|
2020-01-07 11:01:02 -05:00 |
|
Isaac Connor
|
7535769e4b
|
controlcap needs to be larger
|
2020-01-05 17:34:40 -05:00 |
|
Isaac Connor
|
71581831b5
|
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
|
2020-01-05 17:34:27 -05:00 |
|
Isaac Connor
|
6ac26ec1aa
|
quotes
|
2020-01-05 17:33:53 -05:00 |
|
Isaac Connor
|
00f8a450de
|
spaces and quotes
|
2020-01-05 14:59:25 -05:00 |
|
Isaac Connor
|
7fdf6165d5
|
Fix case in var name
|
2020-01-03 17:08:11 -05:00 |
|
Isaac Connor
|
0a495395b0
|
Restore Gain tab
|
2020-01-03 16:34:46 -05:00 |
|
Isaac Connor
|
f572c4092a
|
add checks for Zoom, Focus, White, Iris movement types
|
2020-01-03 15:58:57 -05:00 |
|
Isaac Connor
|
158e26bb25
|
split long lines
|
2020-01-03 15:58:02 -05:00 |
|
Isaac Connor
|
c4aaa33bea
|
add widths for number inputs on controlcap view
|
2020-01-03 15:57:51 -05:00 |
|
Isaac Connor
|
0b3776dbf0
|
change text inputs to number inputs, cleanups
|
2020-01-03 15:57:29 -05:00 |
|
Isaac Connor
|
3cfc1a0a6d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-02 16:45:39 -05:00 |
|
Isaac Connor
|
60d45d967f
|
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
|
2020-01-02 10:17:07 -05:00 |
Andrew Bauer
|
98f7fb63b9
|
fix eslint errors
|
2019-12-31 19:24:51 -06:00 |
|
Isaac Connor
|
6a39893c1d
|
include i elements in data-on-click
|
2019-12-31 19:11:14 -05:00 |
|
Isaac Connor
|
714d304528
|
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
|
2019-12-31 19:10:29 -05:00 |
|
Isaac Connor
|
2c76c12664
|
Fix export to include files when using DEEP scheme. Also make it more efficient
|
2019-12-30 22:18:55 -05:00 |
|
Isaac Connor
|
845f35fe00
|
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
|
2019-12-26 15:57:25 -05:00 |
|
Isaac Connor
|
1977e48ddd
|
DefaultScale is a member of the Monitor, not the event
|
2019-12-26 15:21:27 -05:00 |
|
Isaac Connor
|
42a724891b
|
spacing
|
2019-12-20 16:11:38 -05:00 |
|
Isaac Connor
|
63d20a1514
|
Move hidden inputs to top of form
|
2019-12-20 16:11:24 -05:00 |
|
Isaac Connor
|
5a45835006
|
break up long lines
|
2019-12-20 16:11:10 -05:00 |
|
Isaac Connor
|
23dde04725
|
remove timeout on changing runstate.
|
2019-12-20 16:10:30 -05:00 |
|
Isaac Connor
|
d87bf5a156
|
replace the rate display with a dropdown
|
2019-12-20 11:02:12 -05:00 |
|
Isaac Connor
|
3c59be9616
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-19 09:24:44 -05:00 |
|
Isaac Connor
|
958a6b8218
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-18 19:06:19 -05:00 |
|
Isaac Connor
|
67cc9faa8c
|
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
|
2019-12-18 19:05:06 -05:00 |
|
Isaac Connor
|
34354f5871
|
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
|
2019-12-18 12:13:00 -05:00 |
|
Isaac Connor
|
3b12b67b4a
|
fix eslint
|
2019-12-18 10:40:51 -05:00 |
|
Isaac Connor
|
689956bba7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-13 17:49:00 -05:00 |
|
Isaac Connor
|
5b7efb2b33
|
fix mouseover streaming in chrome when adblocker disabled
|
2019-12-13 17:48:22 -05:00 |
|
Isaac Connor
|
18ed90d147
|
remove second hit to db to load storage areas with no serverid
|
2019-12-13 17:47:51 -05:00 |
|
Isaac Connor
|
0dbc1ef15c
|
Use multiport when talking monitor stream on montage
|
2019-12-13 11:51:55 -05:00 |
|
Isaac Connor
|
0bbbbb302e
|
add default for Units in new zone
|
2019-12-13 11:51:07 -05:00 |
|
Isaac Connor
|
ed417a49b4
|
increase logspopup width to eliminate scrollbars
|
2019-12-08 11:21:38 -05:00 |
|
Isaac Connor
|
3af6358314
|
fix & to &
|
2019-12-02 15:49:49 -05:00 |
|
Isaac Connor
|
72cb5bd1bb
|
add missing </select>
|
2019-12-02 15:49:42 -05:00 |
|
Isaac Connor
|
09faa0a731
|
fix & to &
|
2019-12-02 15:49:32 -05:00 |
|
Isaac Connor
|
b686649589
|
fix & instead of &.
|
2019-12-02 15:34:31 -05:00 |
|
Isaac Connor
|
8bf74d2f35
|
fix & instead of &.
|
2019-12-02 15:34:23 -05:00 |
|
Isaac Connor
|
24022d157d
|
use & instead of &. Put inputs out of table where they belong
|
2019-12-02 15:33:58 -05:00 |
|
Isaac Connor
|
9f49e4f367
|
make Mark column text-align left so that checkboxes line up
|
2019-12-02 15:07:35 -05:00 |
|
Isaac Connor
|
f7e01aa999
|
switch to material icon for dot
|
2019-12-02 14:31:05 -05:00 |
|
Isaac Connor
|
cf35db120d
|
change to material icons, fix missing div
|
2019-12-02 14:21:51 -05:00 |
|
Isaac Connor
|
8e645e45e1
|
fix selecting Monitors by passing MonitorId as MonitorId[]
|
2019-12-02 14:21:25 -05:00 |
|
Isaac Connor
|
b70b75421b
|
quotes and spacing
|
2019-12-02 14:18:27 -05:00 |
|
Isaac Connor
|
9d0a416311
|
remove debugging code
|
2019-12-02 13:41:42 -05:00 |
|
Isaac Connor
|
c9a324b7b3
|
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
|
2019-12-02 13:40:02 -05:00 |
|
Isaac Connor
|
09a6e06132
|
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
|
2019-12-02 13:38:23 -05:00 |
|
Isaac Connor
|
2713565c84
|
using bootstrap layout instead of a table, so text-align: right
|
2019-12-02 13:34:53 -05:00 |
|
Isaac Connor
|
80d0d037b5
|
add a style for inline form not supported by bootstrap 3
|
2019-12-02 13:34:11 -05:00 |
|
Isaac Connor
|
d39193cb6b
|
convert flip to material icons
|
2019-12-02 12:33:13 -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
|
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
|
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
|
5feeedf7f4
|
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
|
2019-11-20 09:31:58 -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
|
56618aac32
|
Handle buttons not existing
|
2019-11-10 15:49:39 -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
|
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
|
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
|
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
|
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
|
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
|
fdf48c4123
|
Merge pull request #2726 from externo6/more-filter-options
More filter options
|
2019-10-16 10:15:58 -04:00 |
|
Isaac Connor
|
f25a823bc8
|
Fix event => zm_event
|
2019-10-16 08:53:40 -04:00 |
|
Isaac Connor
|
8ee567442e
|
UPdate replay, scale, codec dropdown onchanges
|
2019-10-15 15:04:14 -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
|
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
|
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 |
|
Andrew Bauer
|
90b02beb94
|
fix eslint
|
2019-09-30 09:52:41 -05:00 |
|
Isaac Connor
|
7271151eb0
|
add some more aspect ratios
|
2019-09-28 15:16:25 -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
|
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 |
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
|
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
|
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
|
ca40e760f7
|
get global cspNonce
|
2019-09-25 10:15:32 -04:00 |