Isaac Connor
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
Isaac Connor
2d46f2adab
add Secondary Storage Area options.
2019-07-24 11:25:51 -04:00
Isaac Connor
1a0beab703
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
2019-07-24 11:25:38 -04:00
Isaac Connor
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
Isaac Connor
346933126d
Update filter view to use Filter::find
2019-07-23 09:59:49 -04:00
Isaac Connor
df8c46f0f0
Fix #2657
2019-07-08 14:22:46 -04:00
Isaac Connor
da5e8d19b8
Fix #2656
2019-07-07 17:54:45 -04:00
Isaac Connor
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
Isaac Connor
4b41655dc5
fix
2019-07-07 16:10:53 -04:00
Isaac Connor
3c1cd1e750
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
2019-07-07 16:03:54 -04:00
Isaac Connor
2470c09b20
Honour thumbnail width when bringing up frames popup for frames and alarm frames
2019-07-03 17:19:10 -04:00
Isaac Connor
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
Isaac Connor
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
Isaac Connor
305a954ee2
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-06-25 22:20:19 -04:00
Isaac Connor
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
Isaac Connor
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -04:00
Tom Hodder
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
Isaac Connor
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
Isaac Connor
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Isaac Connor
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -04:00
Isaac Connor
d026c61077
Don't allow saving to built in layouts
2019-06-20 13:48:14 -04:00
tolland
ffaad88bf0
switch to using SVG scaling to deal with zone polygons
2019-06-20 17:11:22 +00:00
tolland
edd52e7fbf
add js method to track liveStream img size for zones
2019-06-20 12:46:04 +00:00
tolland
4da5c52cd2
remove extra px in svg tag
2019-06-19 20:18:38 +00:00
Isaac Connor
77eb15ff17
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-19 09:22:21 -04:00
Tom Hodder
70a91c7069
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-19 09:22:21 -04:00
Isaac Connor
199e8182be
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-19 08:36:48 -04:00
Isaac Connor
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -04:00
Tom Hodder
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04:00
Isaac Connor
d87f5e3276
Merge branch 'master' into storageareas
2019-06-11 14:39:08 -04:00
Isaac Connor
ec7b373913
fix structure of events_by_monitor_id
2019-06-11 14:38:51 -04:00
Isaac Connor
1e7cf8c7cf
fix eslint, Fix video not resuming after setting speed to 0.
2019-06-11 14:38:28 -04:00
Isaac Connor
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
Isaac Connor
1eadb814e2
Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient
2019-06-10 15:59:19 -04:00
Isaac Connor
265e49fe45
Add a newline after each filter group to make the code easier to read
2019-06-10 15:58:17 -04:00
Isaac Connor
9b507734b2
spacing
2019-06-06 13:49:24 -04:00
Isaac Connor
41714c676d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-06 13:40:09 -04:00
Isaac Connor
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
fri.K
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
Isaac Connor
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
Isaac Connor
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -04:00
Isaac Connor
9d6091e271
better fix for #2453 . Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
2019-06-04 10:32:54 -04:00
Tom Hodder
a6f3303859
add options help to linked monitors option ( #2633 )
...
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
Isaac Connor
aefd735abb
quotes
2019-05-31 11:00:30 -04:00
Isaac Connor
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
Isaac Connor
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
Isaac Connor
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
Isaac Connor
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
Isaac Connor
fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -04:00
Isaac Connor
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -04:00
Isaac Connor
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
Isaac Connor
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
Isaac Connor
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
Isaac Connor
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
Isaac Connor
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
Isaac Connor
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
Isaac Connor
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
Pliable Pixels
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
Pliable Pixels
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
Pliable Pixels
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
Isaac Connor
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
Isaac Connor
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
Isaac Connor
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
Isaac Connor
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
Jonathan Meredith
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
Pliable Pixels
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
Pliable Pixels
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
Pliable Pixels
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
Pliable Pixels
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
Pliable Pixels
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
Pliable Pixels
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
Pliable Pixels
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
Pliable Pixels
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
Pliable Pixels
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
Isaac Connor
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
Isaac Connor
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
Isaac Connor
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
Isaac Connor
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
Javier González Calleja
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
Isaac Connor
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
Isaac Connor
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
Isaac Connor
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
Isaac Connor
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
Isaac Connor
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
Isaac Connor
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
Isaac Connor
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -04:00
Andrew Bauer
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
Andrew Bauer
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
Isaac Connor
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
Isaac Connor
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
Isaac Connor
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
Isaac Connor
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
Andrew Bauer
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
Isaac Connor
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
Isaac Connor
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
Isaac Connor
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
Isaac Connor
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
Isaac Connor
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
Isaac Connor
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
Isaac Connor
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
Isaac Connor
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
Isaac Connor
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
Isaac Connor
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
Isaac Connor
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
Isaac Connor
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
Isaac Connor
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
Isaac Connor
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
Isaac Connor
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
Isaac Connor
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
Isaac Connor
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
Isaac Connor
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
Chris
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
Isaac Connor
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
Matthew Noorenberghe
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
Matthew Noorenberghe
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
Isaac Connor
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
Isaac Connor
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
Isaac Connor
f0f2b6a17c
implement click_automove and submitToMontrageReview for onclick handlers
2019-03-05 14:35:02 -05:00
Isaac Connor
5a66969fd1
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
2019-03-05 14:34:34 -05:00
Isaac Connor
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
Isaac Connor
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
Isaac Connor
36b00d09e3
fix destination view on the monitors view
2019-03-05 11:02:58 -05:00
Isaac Connor
8053f61a08
fix eslint missing {}
2019-03-05 11:02:09 -05:00
Isaac Connor
76ee31bf68
fix eslint missing {}
2019-03-05 11:01:58 -05:00
Isaac Connor
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
Isaac Connor
7cee8356bd
Fix setting frame width when changing from fixed width to scaled
2019-03-04 13:43:03 -05:00
Isaac Connor
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
Isaac Connor
466c379e94
Merge branch 'master' into storageareas
2019-03-01 14:03:49 -05:00
Isaac Connor
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
Isaac Connor
af9c87a112
Merge branch 'master' into storageareas
2019-02-27 10:53:19 -05:00
Isaac Connor
804c384b4c
add Event Notification support to server
2019-02-27 09:29:11 -05:00
Isaac Connor
5da51d51bc
Merge branch 'master' into storageareas
2019-02-26 10:55:51 -05:00
Isaac Connor
53c0fae688
Merge fix from storageareas for archive/delete in events list
2019-02-26 10:22:58 -05:00
Isaac Connor
627e9f74cf
fix spacing
2019-02-25 15:24:25 -05:00
Isaac Connor
cbd8ee80f8
add namespace for Monitor
2019-02-24 12:40:40 -05:00
Isaac Connor
3b06f3015a
redirect to console of successfullogin takes us to login
2019-02-24 10:07:42 -05:00
Isaac Connor
dd590aa729
remove warning when QUERY_STRING is not set
2019-02-24 10:05:45 -05:00
Isaac Connor
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
Isaac Connor
45778384a6
Merge branch 'release-1.32'
2019-02-22 11:24:23 -05:00
Isaac Connor
9a2dd06e1d
Fix use of empty which isn't supported in old php. Remove the code entirely as I think it was just cutnpasted from somewhere else. We don't care if it is a new server or not in the validate code.
...
Fixes #2540
2019-02-22 11:22:44 -05:00
Isaac Connor
410cb70ddb
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. ( #2534 )
2019-02-22 09:20:54 -05:00
Isaac Connor
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor
e087522203
remove debug
2019-02-21 14:15:10 -05:00
Isaac Connor
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
Isaac Connor
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
Isaac Connor
fbdb5bcb62
Merge branch 'master' into storageareas
2019-02-19 12:06:32 -05:00
Isaac Connor
87988185e5
remove data-on-click-this from markEids[] because we have an onclick bind in initPage
2019-02-19 09:58:03 -05:00
Isaac Connor
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
Isaac Connor
7a8668ea99
whitespace
2019-02-12 16:40:48 -05:00
Isaac Connor
a3374aa26c
Merge branch 'reload_zmfilter_on_filter_save' into storageareas
2019-02-11 13:26:53 -05:00
Pliable Pixels
5a333e153c
show object detected file, if object detection in place ( #2514 )
2019-02-11 10:58:34 -05:00
Matt N
9675367e03
event.js: Wait for delete request to succeed before navigating. Fixes #2384 ( #2515 )
2019-02-11 09:34:51 -05:00
Matthew Noorenberghe
cdbd59f054
bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493
2019-02-10 13:22:08 -08:00
Matthew Noorenberghe
cda4a28fec
Fix accidental use of 'let' in 255806bd54
2019-02-10 11:14:55 -08:00
Isaac Connor
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
Isaac Connor
c9032d3cb4
add autocomplete tags to username and password inputs
2019-02-10 00:27:33 -08:00
Matthew Noorenberghe
99f1e23c5b
Replace usage of PHP_SELF in views/. Fixes #2450
2019-02-09 21:39:19 -08:00
Matthew Noorenberghe
effd609ff7
Escape output of state names. Fixes #2475
2019-02-09 20:40:08 -08:00
Matthew Noorenberghe
d7ede4643d
_monitor_filters.php: Escape MonitorName and Source. Fixes #2457
2019-02-09 19:14:31 -08:00
Matthew Noorenberghe
255806bd54
log.js: Escape HTML to be shown in the log HtmlTable. Fixes #2453
2019-02-09 18:43:55 -08:00
Matthew Noorenberghe
6af2c4ad0e
Escape output of WEB_TITLE, HOME_URL, HOME_CONTENT, & WEB_CONSOLE_BANNER. Fixes #2468
2019-02-09 18:06:21 -08:00
Matthew Noorenberghe
9ce05a9a09
user.php: Escape the Username upon display. Fixes #2467
2019-02-09 17:45:52 -08:00
Matthew Noorenberghe
6d2f3c265f
events.php: Remove inline event handlers and enforce CSP
2019-02-09 17:34:59 -08:00
Matthew Noorenberghe
ef0e5f453a
monitor.php: Fix XSS from LinkedMonitors. Fixes #2463
2019-02-09 17:11:53 -08:00
Matthew Noorenberghe
9705edfe24
monitor.php: Escape monitor method. Fixes #2464
2019-02-09 17:01:45 -08:00
Matthew Noorenberghe
cef54feaf9
monitor.php: Escape a bug of output variables. Fixes #2465
2019-02-09 16:54:06 -08:00
Matthew Noorenberghe
254b7286b4
monitor.php: Escape SignalCheckColour to prevent XSS. Fixes #2451
2019-02-09 16:41:54 -08:00
Matthew Noorenberghe
bb75dad091
filter.php: Escape filter query term value to avoid XSS. Fixes #2462
2019-02-09 15:35:55 -08:00
Matthew Noorenberghe
dd37808ef7
filter.php: Escape AutoExecuteCmd before output to prevent XSS. Fixes #2461
2019-02-09 15:24:13 -08:00
Matthew Noorenberghe
70e59ed546
filter.php: Escape the filter name on output. Fixes #2455
2019-02-09 15:19:15 -08:00
Matthew Noorenberghe
b2a97ee190
frame.php: Fix multiple XSS from 'show' and 'scale' parameters and enforce CSP.
...
Fixes #2448 , fixes #2449 , and fixes #2447 .
2019-02-09 15:10:45 -08:00
Matthew Noorenberghe
7b0ee8a6a2
group: Escape group name in heading. Fixes #2454
2019-02-09 14:05:50 -08:00
Matthew Noorenberghe
fa6716a64b
console: Escape source column output to prevent XSS. Fixes #2452
2019-02-09 02:28:40 -08:00
Matthew Noorenberghe
02f09aad7f
view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443
2019-02-09 02:01:26 -08:00
Matthew Noorenberghe
61f6a92cc0
view=download: Validate the eid parameter to avoid XSS. Fixes #2442
2019-02-09 01:37:32 -08:00
Matthew Noorenberghe
0b38e72f88
view=download: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2441
2019-02-09 01:16:32 -08:00
Isaac Connor
0eb1efff8b
fix eslint errors
2019-02-08 13:48:38 -05:00
Isaac Connor
ee3a0c1fd1
fix validateForm running on monitor cancel due to lack of type=button on cancel button
2019-02-08 09:55:32 -05:00
Isaac Connor
ca781523a8
Merge branch 'master' into storageareas
2019-02-07 08:57:50 -05:00
Isaac Connor
1039149866
fix buttons on events page. data-onclick-this to data-on-click-this
2019-02-07 08:56:48 -05:00
Isaac Connor
d33e094526
Merge branch 'master' into storageareas
2019-02-06 17:03:41 -05:00
Isaac Connor
7e84a5914c
fix CSP policy violations on filters view
2019-02-06 13:55:19 -05:00
Isaac Connor
0783802d0c
fix CSP violations on events
2019-02-06 13:31:34 -05:00
Isaac Connor
b04b67c39d
Fix CSP violation in the onclick of the monitor view in montagereview
2019-02-06 12:17:10 -05:00
Isaac Connor
6744a9a116
Make montagereview more robust when the storage area of an event has been deleted. Add the onmouse events using javascript instead of in the html canvas element so that our CSP policy works.
2019-02-06 11:46:55 -05:00
Isaac Connor
edaf582eb4
Make montagereview more robust when the storage area of an event has been deleted. Add the onmouse events using javascript instead of in the html canvas element so that our CSP policy works.
2019-02-06 11:46:48 -05:00
Isaac Connor
d121ecab75
Merge branch 'improve_session' into storageareas
2019-02-05 15:48:42 -05:00
Isaac Connor
141f2afc8c
Merge branch 'master' into storageareas
2019-02-05 15:46:58 -05:00
Isaac Connor
21702dcc68
Merge branch 'master' into improve_session
2019-02-05 12:35:29 -05:00
Isaac Connor
a40cd144fa
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-05 12:35:15 -05:00
Isaac Connor
c54fe7e89a
fix state actions
2019-02-05 12:35:06 -05:00
Isaac Connor
78bc2c1dc2
add autocomplete tags to username and password inputs
2019-02-05 11:53:57 -05:00
Isaac Connor
a2e04c307d
update buttons. reduce duplicated code. Make it so that users with System=View can at least see if there is an update.
2019-01-31 09:40:19 -05:00
Isaac Connor
86b7fe5d29
fix spacing
2019-01-30 16:08:41 -05:00
Isaac Connor
9a3aa49bae
Merge branch 'fix_bandwidth' into storageareas
2019-01-30 15:18:16 -05:00
Isaac Connor
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
Isaac Connor
604dbf8776
fix state changing/etc
2019-01-30 14:36:46 -05:00
Isaac Connor
2e2404643f
Fix bandwidth due to new actions code. Update buttons on bandwidth popup
2019-01-30 13:20:24 -05:00
Isaac Connor
7ea8be3fa8
spacing, remove non html5 elements
2019-01-25 09:22:08 -05:00
Matt N
8c5687ca30
Fix name/protocol XSS in controlcaps.php. Fixes #2445 ( #2479 )
2019-01-25 08:35:07 -05:00