Isaac Connor
4abfa61bbc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-26 10:03:12 -04:00
Isaac Connor
4c791b390f
fix warning due to undefined vars being used
2020-10-26 09:59:15 -04:00
Isaac Connor
706bf085f4
Add pre and post sql conditions and pre-populate the return
2020-10-26 09:58:47 -04:00
Andrew Bauer
8cf899efc5
remove commented line
2020-10-25 10:58:27 -05:00
Andrew Bauer
e9b71b4ce1
events view server pagination - fix sorting name & monitor
2020-10-25 10:40:29 -05:00
Andrew Bauer
cb073950b9
events view server pagination WIP
2020-10-25 10:28:22 -05:00
Andrew Bauer
f87be2d289
specify the table name when we sort in events view
2020-10-25 08:24:56 -05:00
Isaac Connor
760e20bc0f
Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet
2020-10-24 08:50:59 -04:00
Isaac Connor
2ebd686d19
Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data.
2020-10-23 17:55:43 -04:00
Isaac Connor
da080d44c1
rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter
2020-10-23 16:44:50 -04:00
Andrew Bauer
d425d1006e
push newevents.php to master
2020-10-23 10:21:32 -05:00
Andrew Bauer
235dd2a2fb
don't use wildcards in event view advanced search fields
2020-10-22 15:06:06 -05:00
Andrew Bauer
29819d8044
fix copy/paste error with events.php
2020-10-22 13:27:47 -05:00
Andrew Bauer
d117e993ad
add create task to ajax/log.php
2020-10-22 10:17:34 -05:00
Isaac Connor
4a0ada5335
improve logging of invalid task in ajax/log
2020-10-22 08:52:54 -04:00
Isaac Connor
e6f08959fa
Fix use of result instead of NearEvents
2020-10-21 10:40:26 -04:00
Isaac Connor
34ce3a1498
Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm
2020-10-21 10:36:40 -04:00
Andrew Bauer
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
Andrew Bauer
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
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