d425d1006e
push newevents.php to master
2020-10-23 10:21:32 -05:00
235dd2a2fb
don't use wildcards in event view advanced search fields
2020-10-22 15:06:06 -05:00
29819d8044
fix copy/paste error with events.php
2020-10-22 13:27:47 -05:00
d117e993ad
add create task to ajax/log.php
2020-10-22 10:17:34 -05:00
4a0ada5335
improve logging of invalid task in ajax/log
2020-10-22 08:52:54 -04:00
e6f08959fa
Fix use of result instead of NearEvents
2020-10-21 10:40:26 -04:00
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
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
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
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
89f298771f
server pagination backend improvements
2020-10-19 12:25:13 -05:00
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
e69b3800c7
set return status for cancel and restart commands
2020-10-14 12:22:21 -05:00
bea95bca68
use ZM\Debug
2020-10-14 10:33:40 -05:00
c3a98c1f44
replace shutdown form submit with ajax
2020-10-14 10:03:33 -05:00
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
cd2e96eaec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-13 08:42:28 -04:00
89c76ec140
no need to clare $view as global
2020-10-12 14:52:57 -05:00
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
66a8d3876d
add caching of users by username to improve performance
2020-10-12 11:25:20 -04:00
9e6db17e68
Fix getting next event due to case of asc
2020-10-10 11:09:39 -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
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
0557d847f0
fix ajax archive/unarchive
2020-09-11 17:01:56 -05:00
aa6bf31cbd
pass OLANG as a function parm
2020-09-11 07:51:00 -05:00
cd09ec8fef
rough in Modal Ajax framework
2020-09-10 16:56:58 -05:00
98874cb6d1
provide error message when trying to delete Archived events.
2020-09-03 17:04:52 -04:00
73cdb510b2
Rough in an events ajax request for deleting events
2020-08-31 10:37:22 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -04:00
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -04:00
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
c3a80e7e40
Add MonitorId to event data returned for status request
2020-04-23 11:07:07 -04:00
59f9f37fff
cleanup. Don't output errors that break json response
2020-04-23 11:06:41 -04:00
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -04:00
4e58a38317
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
2020-04-03 15:21:31 -04:00
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
1cbc75813c
improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:57 -05:00
dd0ce50c17
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:30 -05:00
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor