12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
b7fd4e26a5
defend against XSS in Monitor Name
2020-04-23 15:51:29 -04:00
bab609426d
spacing in views/event.php
2020-04-23 15:47:10 -04:00
4e9f0b3463
defend against XSS in Monitor Name
2020-04-23 15:46:05 -04:00
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
8d2ce34149
include id in monitors dropdown so that it is searchable
2020-04-23 15:44:27 -04:00
91b1d7bbeb
alter setButtonState to take either an id or an element so that we can log the missing element
2020-04-23 15:43:36 -04:00
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
eab08783e9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-04-23 10:10:08 -04:00
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
b384d233ae
add async and defer to recaptcha load
2020-04-21 09:20:33 -04:00
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
fb70acdf6c
fix XSS in monitor Name
2020-04-10 11:32:01 -04:00
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
4f8016cc74
spacing in watch.php
2020-04-10 11:16:11 -04:00
85d779a624
defend against XSS in Monitor Name
2020-04-10 11:10:13 -04:00
4fe649c776
defend against XSS in Monitor Name
2020-04-10 11:10:09 -04:00
105be40ce3
fix
2020-04-10 11:09:46 -04:00
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
7473b0572a
defend against XSS in Monitor Name
2020-04-10 11:05:19 -04:00
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
024431808e
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
2020-04-04 16:57:24 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
6feffe2aa9
whitespace
2020-04-04 11:51:39 -04:00
61e6627fce
fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version
2020-04-04 11:48:42 -04:00
1cc60f0857
fix action on cycle play button
2020-04-02 16:06:27 -04:00
87069b99b6
Fix inline-script errors on groups page referenced in #2890
2020-04-02 14:13:28 -04:00
ebac665d4d
Must use namespace ZM
2020-03-31 08:54:47 -04:00
4dcba55ab6
Include Storage.php and Server.php
2020-03-31 08:53:32 -04:00
2fe0096b21
correct label_size array and add translations
2020-03-30 18:34:43 -04:00
ff061bd48e
Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-03-30 10:09:53 -04:00
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
4eed0a9c29
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 14:30:41 -04:00
1ab294e291
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 12:43:21 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
2bd805c1f1
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-03-24 16:16:32 -04:00
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
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
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
3d993eef80
Fix triggers code
2020-03-09 14:39:57 -04:00
f056f787c5
Merge branch 'release-1.34'
2020-03-08 17:24:06 -04:00
e56976c800
Triggers cannot be null, it is '' instead
2020-03-08 17:23:48 -04:00
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
077b8888f9
Use Storage object and add Enabled
2020-03-04 10:46:32 -05:00
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05:00
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
00de49a5c1
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-03-02 12:43:07 -05:00
967e5ad30f
alter setButtonState to take either an id or an element so that we can log the missing element
2020-03-02 11:52:32 -05:00
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
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
1b70ed2076
Merge branch 'fix_generate_video_page' into release-1.34
2020-02-25 18:22:24 -05:00
0c70c5c2a4
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:14:27 -05:00
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -05:00
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
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -05:00
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
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
8c7d2c5e1a
handle a 0 value for scale
2020-02-25 12:14:07 -05:00
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
2020-02-25 11:19:09 -05:00
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -05:00
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
3b1458bb88
add Emailed status to events list
2020-02-19 14:17:44 -05:00
789db4e5a6
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
2020-02-18 13:29:06 -05:00
289bde869d
use a better language for unset value
2020-02-11 14:31:48 -05:00
9f9a97f596
fix dropdown with unset option
2020-02-11 14:29:21 -05:00
844ff529e1
add an unset value to ZM_TIMEZONE in Options->System
2020-02-11 13:24:26 -05:00
52dfbc92e9
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
2020-01-24 11:10:02 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
d95857d419
Add EmailTo,EmailSubject,EmailBody fields to filter view
2020-01-22 14:05:08 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
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
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
4f2df830a8
fix inline js
2020-01-17 09:17:05 -05:00
74b3ad6dd9
add options help for HWACCEL options
2020-01-16 14:33:37 -05:00
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
91acb775eb
Fix Eventount to EventCount
2020-01-13 13:43:14 -05:00
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
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
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
61bc0ddd0a
add missing t and merge some lines
2020-01-07 11:01:53 -05:00
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
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
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
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
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
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
42a724891b
spacing
2019-12-20 16:11:38 -05:00
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -05:00
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
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
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
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00
72cb5bd1bb
add missing </select>
2019-12-02 15:49:42 -05:00
09faa0a731
fix & to &
2019-12-02 15:49:32 -05:00
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
8bf74d2f35
fix & instead of &.
2019-12-02 15:34:23 -05:00
24022d157d
use & instead of &. Put inputs out of table where they belong
2019-12-02 15:33:58 -05:00
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
9d0a416311
remove debugging code
2019-12-02 13:41:42 -05:00
c9a324b7b3
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
2019-12-02 13:40:02 -05:00
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
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
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
ab9f99bdbb
Fix Width & Height rotation when scaling. Fixes #2760
2019-11-22 12:18:30 -05:00
5feeedf7f4
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
2019-11-20 09:31:58 -05:00
ac96a19371
Fix filtering monitors by user's MonitorId restriction
2019-11-19 17:21:01 -05:00
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -05:00
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
54c11bc0d1
define monitor_options as an empty array instead of php implicitly dealing with it
2019-11-01 13:42:01 -04:00
a20517a6db
spacing
2019-11-01 13:41:37 -04:00
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04:00
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
5040d5b075
remove extra (
2019-10-05 16:56:05 -04:00
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
5384b9345a
fix errors on centos 7 with the functions view
2019-10-03 17:30:52 -04:00
11fe748154
Sort control capabilities by Name instead of Id
2019-10-03 17:30:31 -04:00
17611f2e4b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 19:38:21 -04:00
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
95615fee35
fix eslint
2019-10-02 16:42:50 -04:00
6b65e9a60c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 16:41:20 -04:00
7b93a445b8
Finish updating the linked Monitors dropdown
2019-10-02 15:42:56 -04:00
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
b4d5d92d86
Add some non standard resolutions available on some vivotek cameras
2019-09-30 15:06:32 -04:00
90b02beb94
fix eslint
2019-09-30 09:52:41 -05:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
deef948964
Allow anyone to change their skin
2019-09-28 12:58:17 -04:00
ec9e94b99d
Don't add checkboxes if can't edit groups
2019-09-28 12:58:01 -04:00
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
ebcacaa660
Use material icons for buttons
2019-09-26 16:26:37 -04:00
fdaee75310
Use material icons for buttons. Hide the stop button because it does nothing.
2019-09-26 16:26:18 -04:00
e4265bd075
spaces
2019-09-26 16:13:49 -04:00
2b017f782b
Fix missing eid= from View All/View Pages links
2019-09-25 10:35:41 -04:00
bcb8389923
spaces
2019-09-25 10:16:27 -04:00
b936fbac6a
Don't import Monitor.php unless we need to
2019-09-25 10:16:16 -04:00
ca40e760f7
get global cspNonce
2019-09-25 10:15:32 -04:00
54dec069cd
correct quotes and use a button on loging page
2019-09-25 10:15:12 -04:00
1b653e7e79
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
2019-09-25 10:14:41 -04:00
c7d7d45380
Remove :'s, they can be added using css if desired
2019-09-23 11:49:39 -04:00
9a94ce6e41
remove debug
2019-09-23 10:22:25 -04:00
8d95b2f5f8
Don't select Layout when changing size in montage
2019-09-22 14:22:24 -04:00
7b9eaf42b8
Fix selecting group from groups listing under monitor name. Fixes #2711
2019-09-22 12:03:34 -04:00
d7810bf9b3
fix eslint
2019-09-20 14:16:37 -04:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
5d0b4942d6
remove debug
2019-09-20 10:37:48 -04:00
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
b05ecd881e
add onchange to scale
2019-09-19 14:57:21 -04:00
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
d5ee73a9ee
use CaptureResolution instead of CaptureDimensions because it is already in language
2019-09-19 10:50:20 -04:00
1bd70319a9
Add a dimensions dropdown to ease entering monitor dimensions
2019-09-19 10:48:25 -04:00
b3b7ec660b
Add a test for the built-in layouts. Can't edit them.
2019-09-18 11:19:28 -04:00
9e8c17dfaf
Merge branch 'master' into tolland-remove-extra-px
2019-09-18 11:17:50 -04:00
0eb1fff5b5
remove unused view=image-ffmpeg
2019-09-18 11:16:49 -04:00
f509b4c9d1
spacing
2019-09-18 11:10:40 -04:00
ce1823bd29
spacing and fix saving
2019-09-17 12:46:11 -04:00
bcaabf4cf2
update buttons
2019-09-17 12:09:36 -04:00
f0cfd674c1
Cleanup options skins tab. Setting the values happens in index.php. Use global and
2019-09-17 12:06:54 -04:00
d141632256
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
2019-09-11 09:18:03 -04:00
bce1a48b66
Fix another Monitorid. Fixes #2699
2019-09-05 10:31:22 -04:00
f568e0da30
Fix event->id() to event->Id()
2019-09-04 10:11:16 -04:00
16f0ad4f59
Fix Monitorid => MonitorId
2019-09-03 12:55:45 -04:00
99a2ddba63
Add listing of Secondary Storage area in events list
2019-08-29 11:27:06 -04:00
c6dd3ffbec
tabs to spaces
2019-08-28 09:19:09 -04:00
91ef4f5932
x264 encode works on arm now, so let people choose it
2019-08-28 08:51:42 -04:00
8043ba8092
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-27 16:49:12 -04:00
9b3fecd7a0
Fix iOS autocapitalizing username field on login ( #2687 )
...
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.
Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
41fb11d776
Fix Arched lacking () so not working
2019-08-27 15:19:38 -04:00
d7d2c140a0
Use index to server hosting storage where event is saved to talk to zms
2019-08-27 15:19:18 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
5527685162
Merge branch 'storageareas'
2019-08-26 16:22:10 -04:00
292b530f99
Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us
2019-08-26 16:20:23 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -04:00
c4c6935c6e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-08-23 18:17:50 -04:00
73ba699dc4
Sort filter fields dropdown
2019-08-23 18:17:45 -04:00
e707bd8e72
correct getting frame_id so we get images instead of nodata
2019-08-23 17:59:29 -04:00
7598654740
add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms
2019-08-23 17:58:40 -04:00
61926d3b85
Only parse the filter if it is valid. Remove unused filterQuery var
2019-08-20 10:03:44 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
Isaac Connor
hax0kartik
Isaac Connor
Andrew Bauer
Garrett Scott
PrplHaz4
Andrew Bauer
Isaac Connor
externo6
Isaac Connor
Paulius Gedrikas
Isaac Connor