Commit Graph

3707 Commits

Author SHA1 Message Date
Isaac Connor ce99a9456b Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:44 -05:00
Isaac Connor 68ad1cf1f7 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:37 -05:00
Isaac Connor 786e2fec92 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:27 -05:00
Isaac Connor af9e279f9e Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:55:27 -05:00
Isaac Connor d75e93249c Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:54:12 -05:00
Isaac Connor 9d22de98a3 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:45 -05:00
Isaac Connor 9e6a9cad80 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:17 -05:00
Isaac Connor 0d404ac66f Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:50:45 -05:00
Isaac Connor 4731041a40 FS Storage DiskSpace isn't implemented. 2020-11-04 12:42:04 -05:00
Isaac Connor af399bb174 Reqiure Id to have a value not just be set 2020-11-04 09:18:41 -05:00
Isaac Connor 2c899bd3c5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-03 12:11:58 -05:00
Isaac Connor 6112db627c Even if we found the filter in the db, if it is present in the query string, update the object with the new values 2020-11-03 11:59:28 -05:00
Isaac Connor b2385ccecc colour match a:link to navbar colour. This has the effect of brightening up all links. 2020-11-03 11:53:15 -05:00
Isaac Connor 492e65c2fd Add missing PathToAPI 2020-11-02 12:42:30 -05:00
Andrew Bauer 3d795be864 remove the thumbnail col if WEB_LIST_THUMBS is off 2020-11-01 15:46:43 -06:00
Andrew Bauer 824f38c746 hide settings buttons rather than disable for non Local monitors 2020-11-01 08:05:53 -06:00
Isaac Connor 97f4d9e7a2 Make the event count and diskspace in the storage row be a link to events for that storage area. 2020-10-29 09:40:14 -04:00
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 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 a5bb2365b5 update auth_relay when we update auth_hash 2020-10-26 18:49:03 -04:00
Isaac Connor a2596505e9 add LockRows to Filters 2020-10-26 18:47:17 -04:00
Andrew Bauer fad4339713 no need for full page reload with server pagination 2020-10-26 12:12:50 -05: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
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 cb073950b9 events view server pagination WIP 2020-10-25 10:28:22 -05:00
Isaac Connor a2dc4b5f08 handle params.daa not existing 2020-10-24 09:45:38 -04:00
Isaac Connor efaf95beda dirty hack to rename data.filter to data.advsearch 2020-10-24 08:51:26 -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 29819d8044 fix copy/paste error with events.php 2020-10-22 13:27:47 -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 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
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 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