Andrew Bauer
5fa8cbf158
add Frames button to event view
2020-12-24 14:46:13 -06:00
Andrew Bauer
e66b050c72
WIP jquery conversion of event view
2020-12-24 10:38:44 -06:00
Andrew Bauer
f64f3262ed
WIP replace mootools in evnet.js
2020-12-23 12:19:35 -06:00
Andrew Bauer
f857d12103
WIP replace mootools in event.js
2020-12-23 10:51:23 -06:00
Isaac Connor
7f9b977ec2
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:57:27 -05:00
Isaac Connor
aed83cab31
Load delconfirm content on demand
2020-12-15 10:11:30 -05:00
Andrew Bauer
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
Andrew Bauer
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
Andrew Bauer
69e540c104
deploy canView and canEdit js objects
2020-12-08 14:25:48 -06:00
Andrew Bauer
051e361958
eslint
2020-12-01 12:19:01 -06:00
Andrew Bauer
f12c8f453e
after deleting an event, call streamNext rather than reload
2020-12-01 09:30:06 -06:00
Andrew Bauer
23fcd1f2c5
modernize the event playback view
2020-12-01 09:07:42 -06:00
Isaac Connor
68cdd2123d
Merge branch 'release-1.34'
2020-11-05 13:55:15 -05:00
Isaac Connor
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
Isaac Connor
9d22de98a3
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:45 -05:00
Isaac Connor
4f56f9d82b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-15 17:20:10 -04:00
Isaac Connor
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
Isaac Connor
78cbacae2e
When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do
2020-10-15 17:18:38 -04:00
Andrew Bauer
f32a7aaff5
deploy insertModalHtml
2020-10-14 15:58:39 -05:00
Andrew Bauer
ec040b1bfd
don't set popup flag in event view
2020-10-14 13:59:15 -05:00
Isaac Connor
03c8e86908
update some quotes
2020-10-10 11:09:51 -04:00
Isaac Connor
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
Isaac Connor
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
Isaac Connor
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
Isaac Connor
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
Isaac Connor
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
Isaac Connor
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
Andrew Bauer
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
Andrew Bauer
47e5a26da4
eslint
2020-09-27 07:41:05 -05:00
Andrew Bauer
a6413ccd7f
call modal when edit btn is clicked on event view
2020-09-27 07:12:32 -05:00
Andrew Bauer
2655118cbd
change call to popup -> view in event.js
2020-09-26 21:21:29 -05:00
Andrew Bauer
9d2450d55d
load export view, rather than popup
2020-09-26 21:15:50 -05:00
Andrew Bauer
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
Andrew Bauer
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
Andrew Bauer
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
Isaac Connor
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
Isaac Connor
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
Isaac Connor
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
Isaac Connor
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
Isaac Connor
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
Isaac Connor
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
Isaac Connor
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
Isaac Connor
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
Isaac Connor
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
Isaac Connor
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
Isaac Connor
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -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
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
Isaac Connor
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00