Commit Graph

3552 Commits

Author SHA1 Message Date
Isaac Connor 0a4a144bbc Merge branch 'location' 2020-09-28 09:33:28 -04:00
Andrew Bauer 784533ac07 clean up group view 2020-09-27 08:11:45 -05:00
Andrew Bauer 47e5a26da4 eslint 2020-09-27 07:41:05 -05:00
Andrew Bauer a6413ccd7f call modal when edit btn is clicked on event view 2020-09-27 07:12:32 -05:00
Andrew Bauer 2655118cbd change call to popup -> view in event.js 2020-09-26 21:21:29 -05:00
Andrew Bauer 9d2450d55d load export view, rather than popup 2020-09-26 21:15:50 -05:00
Andrew Bauer b2cf48a645 remove unused call to filter popup 2020-09-26 21:06:57 -05:00
Andrew Bauer 1260d7bbb2 convert controlcap tabs to pills 2020-09-26 17:05:13 -05:00
Andrew Bauer 935f73ad33 reconfig controlcap cancel button 2020-09-26 16:39:31 -05:00
Andrew Bauer dc08319037 add navbar to error view 2020-09-26 14:29:02 -05:00
Andrew Bauer 112003f9de eslint 2020-09-26 13:55:56 -05:00
Andrew Bauer 0c4fcbbe97 convert controlcaps view to bstable 2020-09-26 12:09:41 -05:00
Andrew Bauer 48a649a132 extend pill list bkgnd vertically in options 2020-09-26 07:30:15 -05:00
Andrew Bauer df5192a6b4 link to controlcaps from options view 2020-09-25 21:46:54 -05:00
Andrew Bauer b7efdebf9a dynamically find the Level col index 2020-09-25 21:26:22 -05:00
Andrew Bauer f4e7e264f0 fix makelink 2020-09-25 16:18:44 -05:00
Andrew Bauer 582d85f083 unpopup the controlcaps views 2020-09-25 16:12:05 -05:00
Andrew Bauer eedf18073f add navbar to controlcap views 2020-09-25 16:05:16 -05:00
Andrew Bauer 6a5610e404 add back and refresh buttons to user view 2020-09-25 15:49:18 -05:00
Andrew Bauer ea99bc173e add navbar to monitor probe views 2020-09-25 14:49:14 -05:00
Andrew Bauer 2b0badfebe add back and refresh buttons to zones 2020-09-25 13:44:55 -05:00
Andrew Bauer 8018bd4ed9 add back & refresh buttons to zone view 2020-09-25 13:37:06 -05:00
Andrew Bauer d66b0be1bb fix scalecontrol on frame view 2020-09-25 13:08:55 -05:00
Andrew Bauer c73dbc480f unpopup the svg ploygon in zones 2020-09-25 12:34:04 -05:00
Andrew Bauer ae9139b00c unpopup zone view 2020-09-25 10:52:13 -05:00
Andrew Bauer 1ac5572d59 unpopup the zones view 2020-09-25 07:56:09 -05:00
Andrew Bauer 493b9d0ef7 revert newlog row colors back to former 2020-09-25 07:21:14 -05:00
Isaac Connor f9d28ddabe stick a map on the location tab 2020-09-24 20:31:22 -04:00
Isaac Connor a3f4837186 Use config options for tile datam access tokens and turning geolocation on/off 2020-09-24 20:30:57 -04:00
Isaac Connor a109d7bba0 leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag 2020-09-24 20:21:38 -04:00
Isaac Connor 386f991364 Merge branch 'master' into location 2020-09-24 19:28:57 -04:00
Isaac Connor bcb430d393 copy log.css to newlog and add a style for bg-danger 2020-09-24 16:03:26 -04:00
Andrew Bauer 310e52840d remove under construction banner 2020-09-24 12:29:28 -05:00
Andrew Bauer 89fddf3555 decrease refresh timing 2020-09-24 12:27:03 -05:00
Isaac Connor d58f776d9d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-24 12:13:01 -04:00
Isaac Connor e6d7a528d8 Use newer Filter object methods 2020-09-24 12:12:49 -04:00
Isaac Connor cdc07715b7 remove parseFilterToTre and fix filter['query'] to filter['querystring'] 2020-09-24 12:12:37 -04:00
Andrew Bauer e4a1bacbbf get adv search working in newlog view 2020-09-24 11:05:34 -05:00
Andrew Bauer 88f1dcca13 centralize bstable icon var, change table refresh icon 2020-09-24 08:25:39 -05:00
Isaac Connor e4bbbce161 fix eslint 2020-09-24 09:13:44 -04:00
Isaac Connor 9c7bbd4aa7 introduce output_script_if_exists, use it to link leaflet.js if it exists 2020-09-24 09:13:25 -04:00
Isaac Connor 624bcdcde0 Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them 2020-09-24 09:01:30 -04:00
Andrew Bauer b4450fecec init bootstrap-table only once 2020-09-23 14:32:40 -05:00
Andrew Bauer 16a593e904 eslint 2020-09-23 13:56:41 -05:00
Andrew Bauer 3f2f7359f0 rough in new log view - very rough 2020-09-23 13:09:19 -05:00
Isaac Connor 70be6bc84c Add an estimated ram use to buffer tabs 2020-09-22 16:21:59 -04:00
Isaac Connor eb736df405 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-22 15:51:49 -04:00
Isaac Connor fbc15c8109 Fix FPS Report Interval label 2020-09-22 15:51:44 -04:00
Andrew Bauer d2ba9c5234 load bs-table toolbar & autorefresh 2020-09-22 14:23:25 -05:00
Andrew Bauer 2bdbb48692 update to bootstrap-table 1.18.0 and more extensions 2020-09-22 14:09:02 -05:00