284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
5fa8cbf158
add Frames button to event view
2020-12-24 14:46:13 -06:00
a231125fb3
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
2020-12-22 10:23:44 -05:00
48db741b4e
Fix merge from master
2020-12-15 15:59:02 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
48c6309394
add emailed & archived status to event view
2020-12-13 15:01:47 -06:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
23fcd1f2c5
modernize the event playback view
2020-12-01 09:07:42 -06:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
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
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04: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
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -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
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -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
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
50986ce3b4
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2019-11-30 13:53:05 -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
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Matthew Noorenberghe
Isaac Connor