Isaac Connor
ff14d11fef
Don't output the filter, just log it!
2020-10-13 10:07:27 -04:00
Isaac Connor
e4fec8c5ea
code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature
2020-10-13 09:02:38 -04:00
Andrew Bauer
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
Andrew Bauer
49fec5142c
remove popup code form skin.js
2020-10-12 13:34:40 -05:00
Andrew Bauer
e5e1455f7a
replace embedded popuplinks in watch view
2020-10-12 13:26:20 -05:00
Andrew Bauer
332ec2032a
replace createPopup with location.assign
2020-10-12 12:37:23 -05:00
Andrew Bauer
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
Andrew Bauer
0f263407a5
make redirect conditional on previous view
2020-10-12 10:32:25 -05:00
Isaac Connor
3646a66168
translate unquoted literal Filter
2020-10-12 11:20:22 -04:00
Isaac Connor
1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -04:00
Isaac Connor
1854e02ab3
Accept both Id and filter[Id] when loading filters.
2020-10-12 10:55:42 -04:00
Isaac Connor
3fa0ef25f6
Add a link to the filter representing the events list
2020-10-12 10:55:03 -04: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
7f67d09749
test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array
2020-10-07 11:14:57 -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
76af02cc76
whitespace
2020-10-05 16:31:26 -05:00
Andrew Bauer
01596ec26c
whitespace
2020-10-05 15:53:46 -05:00
Andrew Bauer
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
Andrew Bauer
f93450f9ea
remove plugin support for viewing downloads
2020-10-05 14:44:45 -05:00
Andrew Bauer
321de3c604
only update changed elements in video view
2020-10-05 13:59:44 -05:00
Andrew Bauer
862f0ca732
add xmlfooter to video view, replace mootools
2020-10-05 09:37:00 -05:00
Andrew Bauer
2e6efbb349
replace inlince onchange event in control view
2020-10-03 21:44:24 -05:00
Andrew Bauer
d9b8a7ceb2
remove unused view
2020-10-03 21:35:38 -05:00
Andrew Bauer
adb715c42c
fix typo
2020-10-03 21:32:07 -05:00
Andrew Bauer
a0ad52bac9
replace another inline onchange event
2020-10-03 21:30:48 -05:00
Andrew Bauer
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
Andrew Bauer
65b6dad48c
eslint
2020-10-03 17:38:56 -05:00
Andrew Bauer
8d19cee811
unpopup the addnewuser button
2020-10-03 17:12:44 -05:00
Andrew Bauer
aee5430bc8
only load preset and settings modals when needed
2020-10-03 17:00:20 -05:00
Andrew Bauer
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
Andrew Bauer
391ce88f05
eslint
2020-10-02 21:11:54 -05:00
Andrew Bauer
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
Andrew Bauer
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
Andrew Bauer
7b5090ceab
move newlog view to log view
2020-10-02 13:26:35 -05:00
Andrew Bauer
c5f69b9441
eslint
2020-10-02 13:24:30 -05:00
Andrew Bauer
950b04c659
convert popuplink
2020-10-02 12:51:17 -05:00
Andrew Bauer
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
Andrew Bauer
1691e4321b
don't log ajax response text if it is empty
2020-10-02 10:28:50 -05:00
Andrew Bauer
a80b4b91fb
fix x10 device edit
2020-10-01 16:03:58 -05:00
Andrew Bauer
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
Andrew Bauer
c61c111d9e
modernize devices view
2020-10-01 12:52:20 -05:00
Andrew Bauer
ef958b1649
enable mgmt of x10 device permissions
2020-10-01 10:51:59 -05:00
Andrew Bauer
e26e36606f
update version check logic in navbar
2020-10-01 08:46:58 -05:00
Andrew Bauer
c4cf52c2bc
new version notice is now part of the navbar
2020-10-01 08:15:20 -05:00
Andrew Bauer
591a30f1fe
fix typo
2020-09-30 13:33:11 -05:00