Isaac Connor
|
90c5f63d6d
|
Fix session.gc SQL issue. Don't need a * when deleting
|
2020-10-24 09:05:39 -04:00 |
Isaac Connor
|
efaf95beda
|
dirty hack to rename data.filter to data.advsearch
|
2020-10-24 08:51:26 -04: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
|
2178da387d
|
pass desired object name into querystring()
|
2020-10-23 17:56:38 -04:00 |
Isaac Connor
|
b6004012e9
|
implement passing the object name to use when constructing the querystring
|
2020-10-23 17:56:05 -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 |
Isaac Connor
|
8a3e0e108c
|
Put back filter query code
|
2020-10-23 14:02:27 -04:00 |
Isaac Connor
|
ad137adb4c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-23 11:30:19 -04:00 |
Andrew Bauer
|
d425d1006e
|
push newevents.php to master
|
2020-10-23 10:21:32 -05:00 |
Isaac Connor
|
5d7e3b0510
|
handle no responseText in jqxhr
|
2020-10-23 11:12:57 -04:00 |
Isaac Connor
|
d62a5caccd
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-23 09:35:13 -04:00 |
Isaac Connor
|
90e81c5774
|
Merge branch 'release-1.34'
|
2020-10-23 09:34:35 -04: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 |
Isaac Connor
|
a0f733615c
|
allow empty string as a default value
|
2020-10-22 11:26:34 -04:00 |
Andrew Bauer
|
d117e993ad
|
add create task to ajax/log.php
|
2020-10-22 10:17:34 -05:00 |
Isaac Connor
|
40c57b4b23
|
Improve logic in set, improve logging
|
2020-10-22 10:43:53 -04:00 |
Isaac Connor
|
6c546f36ae
|
allow dashes and underscores in log file name
|
2020-10-22 10:43:35 -04:00 |
Andrew Bauer
|
230f35f0c0
|
comment out debug in events.js
|
2020-10-22 08:50:06 -05:00 |
Andrew Bauer
|
0d14dcfbfa
|
WIP events view server pagination
|
2020-10-22 08:49:07 -05:00 |
Isaac Connor
|
9372b2ef8c
|
remove debug
|
2020-10-22 08:53:05 -04: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
|
8f8526c2f1
|
add some debug to session garbage collection
|
2020-10-21 10:38:42 -04:00 |
Isaac Connor
|
946a59ce8b
|
add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime
|
2020-10-21 10:37:39 -04:00 |
Isaac Connor
|
1c5e161909
|
quotes
|
2020-10-21 10:37:06 -04:00 |
Isaac Connor
|
1dfebc24b0
|
Fix ZM\
|
2020-10-21 10:36:58 -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 |
Isaac Connor
|
452416e72a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 19:23:12 -04:00 |
Isaac Connor
|
d88fd5e4e0
|
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
|
2020-10-20 19:23:03 -04:00 |
Isaac Connor
|
b950962f98
|
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
|
2020-10-20 19:21:15 -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 |
Isaac Connor
|
bb5646baac
|
Load Logout modal content on click instead of every page load
|
2020-10-20 12:31:06 -04:00 |
Isaac Connor
|
5b27d77ea4
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 11:52:25 -04:00 |
Isaac Connor
|
1a77958548
|
Make loading the function modal happen on click instead of every page load.
|
2020-10-20 11:52:18 -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 |
Isaac Connor
|
8a6aaa019f
|
Bump version for release to 1.34.22
|
2020-10-19 14:29:18 -04:00 |
Isaac Connor
|
0e63874533
|
fix calling changeScale when scale is 0 instead of auto
|
2020-10-19 14:28:21 -04:00 |
Isaac Connor
|
127ef9a130
|
Fix scaling when using ScaleToFit
|
2020-10-19 14:28:02 -04:00 |
Isaac Connor
|
080557d580
|
add an id to buttons div so that we can use it when calling scaleToFit
|
2020-10-19 14:27:43 -04:00 |
Isaac Connor
|
617a1faa99
|
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
|
2020-10-19 13:25:26 -04:00 |
Andrew Bauer
|
89f298771f
|
server pagination backend improvements
|
2020-10-19 12:25:13 -05:00 |
Isaac Connor
|
eefbed04c1
|
Add debugging for min_section_length keeping us in ALERT
|
2020-10-19 13:24:30 -04:00 |
Isaac Connor
|
df2f5f814b
|
fix case in mocord where cause would not contain motion
|
2020-10-19 13:24:08 -04:00 |
Isaac Connor
|
cc24df9593
|
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
|
2020-10-19 13:23:40 -04:00 |
Andrew Bauer
|
7ae7e05f14
|
roughin ajax call in event.js for server side pagination
|
2020-10-19 09:29:39 -05:00 |