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
9d22de98a3
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:45 -05:00
4f56f9d82b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-15 17:20:10 -04:00
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
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
f32a7aaff5
deploy insertModalHtml
2020-10-14 15:58:39 -05:00
ec040b1bfd
don't set popup flag in event view
2020-10-14 13:59:15 -05:00
03c8e86908
update some quotes
2020-10-10 11:09:51 -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
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
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
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
47e5a26da4
eslint
2020-09-27 07:41:05 -05:00
a6413ccd7f
call modal when edit btn is clicked on event view
2020-09-27 07:12:32 -05:00
2655118cbd
change call to popup -> view in event.js
2020-09-26 21:21:29 -05:00
9d2450d55d
load export view, rather than popup
2020-09-26 21:15:50 -05:00
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
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
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -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
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -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
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
9675367e03
event.js: Wait for delete request to succeed before navigating. Fixes #2384 ( #2515 )
2019-02-11 09:34:51 -05:00
a2d4dc974b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-21 11:19:07 -05:00
e663397816
spacing
2019-01-21 11:17:21 -05:00
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Matt N