68cdd2123d
Merge branch 'release-1.34'
2020-11-05 13:55:15 -05:00
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
9e6a9cad80
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:17 -05:00
e2b76257eb
Merge branch 'release-1.34'
2020-10-19 09:10:28 -04:00
14894dfb00
remove extra comma
2020-10-19 09:08:25 -04:00
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
5869817e0d
set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php
2020-10-15 17:17:20 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
034bee9bb2
fix errors due to selects no longer having an id by default
2020-09-05 17:33:17 -04:00
bd829f8aa1
Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033
2020-09-04 10:25:05 -04:00
69bee20ef5
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:56:30 -04:00
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
0f90b999c0
use filter class instead of parseFilter
2020-08-17 17:41:38 -04:00
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
56a43741c5
Handle a zero value for scale
2020-04-23 16:37:26 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -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
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04:00
ebcacaa660
Use material icons for buttons
2019-09-26 16:26:37 -04:00
41fb11d776
Fix Arched lacking () so not working
2019-08-27 15:19:38 -04:00
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
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
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
3f5a2a2aa6
disable delete button when event is archived.
2019-01-07 15:56:23 -05:00
e0a9c4a21e
fix event popup detection
2018-12-24 11:23:58 -05:00
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
605397b565
Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319
2018-11-29 09:43:21 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
Isaac Connor
Matthew Noorenberghe
Isaac Connor
Isaac Connor