Commit Graph

7153 Commits

Author SHA1 Message Date
Isaac Connor 858674c0b2 Merge branch 'master' into filter_locking 2020-10-28 12:52:52 -04:00
Isaac Connor 686f793d09 fix truth value for ZM_OPT_USE_GEOLOCATION 2020-10-28 12:49:39 -04:00
Isaac Connor b3a28b2ba2 fix confusion in syslog reporting web_php when the error was actually web_js 2020-10-28 12:49:03 -04:00
Isaac Connor df788f2810 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-28 12:40:00 -04:00
Isaac Connor c67b3c5a1f fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit 2020-10-26 18:49:41 -04:00
Isaac Connor 1690bcbd38 update auth_relay when we update auth_hash 2020-10-26 18:49:14 -04:00
Isaac Connor a5bb2365b5 update auth_relay when we update auth_hash 2020-10-26 18:49:03 -04:00
Isaac Connor ffc5249a66 add LockRows to Filters 2020-10-26 18:47:55 -04:00
Isaac Connor a2596505e9 add LockRows to Filters 2020-10-26 18:47:17 -04:00
Andrew Bauer 7b106e2522 don't use wildcards in advanced search 2020-10-26 12:20:26 -05:00
Andrew Bauer fad4339713 no need for full page reload with server pagination 2020-10-26 12:12:50 -05:00
Isaac Connor 5ed168bccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 13:07:18 -04:00
Isaac Connor 1f64a263eb give better log when jqxhr is empty 2020-10-26 13:06:41 -04:00
Isaac Connor 59cf5c33c2 reset search on events load 2020-10-26 13:06:22 -04:00
Isaac Connor da87b5b475 Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .= 2020-10-26 13:06:05 -04:00
Andrew Bauer 97573122bc fix EndTime 2020-10-26 09:33:11 -05:00
Andrew Bauer 27b39a0258
comment out warning used for debug 2020-10-26 09:19:08 -05:00
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 e5563dc901 remove unwanted # 2020-10-25 16:06:37 -05:00
Andrew Bauer 6d00924c9b deploy server pagination for events view 2020-10-25 12:11:34 -05: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 a2dc4b5f08 handle params.daa not existing 2020-10-24 09:45:38 -04:00
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
Andrew Bauer d117e993ad add create task to ajax/log.php 2020-10-22 10:17:34 -05: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