Isaac Connor
41ed267b71
move view to the form action so that it is part of get request instead of post
2020-10-20 12:31:38 -04:00
Andrew Bauer
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
Andrew Bauer
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
Andrew Bauer
89f298771f
server pagination backend improvements
2020-10-19 12:25:13 -05:00
Andrew Bauer
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
Andrew Bauer
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
Andrew Bauer
e69b3800c7
set return status for cancel and restart commands
2020-10-14 12:22:21 -05:00
Andrew Bauer
bea95bca68
use ZM\Debug
2020-10-14 10:33:40 -05:00
Andrew Bauer
c3a98c1f44
replace shutdown form submit with ajax
2020-10-14 10:03:33 -05:00
Isaac Connor
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
Isaac Connor
cd2e96eaec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-13 08:42:28 -04:00
Andrew Bauer
89c76ec140
no need to clare $view as global
2020-10-12 14:52:57 -05:00
Andrew Bauer
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
Andrew Bauer
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
Isaac Connor
66a8d3876d
add caching of users by username to improve performance
2020-10-12 11:25:20 -04:00
Isaac Connor
9e6db17e68
Fix getting next event due to case of asc
2020-10-10 11:09:39 -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
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
Isaac Connor
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
Isaac Connor
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
Isaac Connor
2faedc6248
Sort sessions by access time so that we list active users first
2020-10-05 10:34:52 -04:00
Isaac Connor
1cf181372f
Only load users for logged in sessions
2020-10-05 10:30:57 -04:00
Isaac Connor
fa641a0345
Convert progress to a double instead of int.
2020-10-05 10:30:38 -04:00
Isaac Connor
6d1e5330e3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-05 09:30:49 -04:00
Isaac Connor
93021f5806
Update getNearEvents to handle when event doesn't exist
2020-10-05 09:30:33 -04:00
Andrew Bauer
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
Andrew Bauer
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -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
Isaac Connor
311ba4ef69
use bootstrap styles on logged in user table. Include ip address
2020-10-02 16:04:56 -04:00
Isaac Connor
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
Isaac Connor
d97f8af215
Finish showing logged in users
2020-10-02 15:56:39 -04:00
Isaac Connor
23f2c1468f
rough in a table of the logged in users
2020-10-02 15:21:58 -04:00
Andrew Bauer
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
Andrew Bauer
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
Andrew Bauer
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
Andrew Bauer
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
Andrew Bauer
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
Andrew Bauer
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
Andrew Bauer
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
Andrew Bauer
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
Isaac Connor
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
Isaac Connor
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
Isaac Connor
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
Andrew Bauer
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
Andrew Bauer
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
Andrew Bauer
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
Andrew Bauer
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
Andrew Bauer
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00