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
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
2faedc6248
Sort sessions by access time so that we list active users first
2020-10-05 10:34:52 -04:00
1cf181372f
Only load users for logged in sessions
2020-10-05 10:30:57 -04:00
fa641a0345
Convert progress to a double instead of int.
2020-10-05 10:30:38 -04:00
6d1e5330e3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-05 09:30:49 -04:00
93021f5806
Update getNearEvents to handle when event doesn't exist
2020-10-05 09:30:33 -04:00
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
311ba4ef69
use bootstrap styles on logged in user table. Include ip address
2020-10-02 16:04:56 -04:00
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
d97f8af215
Finish showing logged in users
2020-10-02 15:56:39 -04:00
23f2c1468f
rough in a table of the logged in users
2020-10-02 15:21:58 -04:00
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
a43cbc05af
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:03:03 -04:00
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
96474a7d94
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:00:03 -04:00
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00
2757b74957
convert servermodal function to php file
2020-09-18 10:34:33 -05:00
a058d077bb
fix typo
2020-09-18 10:11:58 -05:00
10119dc609
convert storage function to php file
2020-09-18 10:02:02 -05:00
1b2f0514b9
convert delconfirm function to php file
2020-09-18 09:43:29 -05:00
6e6b9a464b
convert enoperm function to php file
2020-09-18 09:24:23 -05:00
416de4a068
fix git screwup
2020-09-18 08:56:17 -05:00
bc7cadcc73
convert optionhelp function to php file
2020-09-18 08:35:21 -05:00
f61a21fec4
Add modals dir with filterdebug modal
2020-09-17 15:17:53 -04:00
1caaf01502
Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json.
2020-09-17 15:14:09 -04:00
afdd4702a2
add server modal
2020-09-16 08:30:45 -05:00
508967ffe9
fix typo on modal.php
2020-09-14 13:51:24 -05:00
fb85d6f79c
rough in eventdetail modal
2020-09-14 13:47:09 -05:00
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
547e1d6cc4
rough in error no permisson modal
2020-09-12 08:36:19 -05:00
Isaac Connor
Andrew Bauer
Andrew Bauer