Commit Graph

2906 Commits

Author SHA1 Message Date
Andrew Bauer c5f69b9441 eslint 2020-10-02 13:24:30 -05:00
Andrew Bauer 950b04c659 convert popuplink 2020-10-02 12:51:17 -05:00
Andrew Bauer 6c0f61ebbd rework devices view, remove inline onclick 2020-10-02 12:39:05 -05:00
Andrew Bauer a80b4b91fb fix x10 device edit 2020-10-01 16:03:58 -05:00
Andrew Bauer 186b8ac947 convert x10 device view to a modal 2020-10-01 15:52:33 -05:00
Andrew Bauer c61c111d9e modernize devices view 2020-10-01 12:52:20 -05:00
Andrew Bauer ef958b1649 enable mgmt of x10 device permissions 2020-10-01 10:51:59 -05:00
Andrew Bauer c4cf52c2bc new version notice is now part of the navbar 2020-10-01 08:15:20 -05:00
Andrew Bauer 591a30f1fe fix typo 2020-09-30 13:33:11 -05:00
Andrew Bauer 4bc373105d fix typo 2020-09-30 13:12:58 -05:00
Andrew Bauer 9b9138f113 replace popup calls in montagereview 2020-09-30 12:20:24 -05:00
Andrew Bauer d77b55d1d6 replace popup code in add_monitor 2020-09-30 10:40:13 -05:00
Andrew Bauer 2d30d7aafa convert download view to modal 2020-09-30 09:12:54 -05:00
Isaac Connor 3024c46dbb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-29 14:50:13 -04:00
Andrew Bauer 6eaa8aa211 whitespace 2020-09-29 13:05:00 -05:00
Andrew Bauer 4694ce59bb export event function does not need element 2020-09-29 12:55:57 -05:00
Andrew Bauer a12a870e2c download.js - replace mootools with jquery 2020-09-29 12:51:01 -05:00
Andrew Bauer 953a6e0785 more fixes to download view 2020-09-29 10:15:58 -05:00
Andrew Bauer 5200af8206 add missing return to download view 2020-09-29 09:50:15 -05:00
Isaac Connor 1af20cea6a Fix unarchive. The reload was killing the getJSON. Should only do that on success 2020-09-29 09:42:31 -04:00
Andrew Bauer fc366aa503 add missing echo 2020-09-28 15:41:07 -05:00
Andrew Bauer 1361f0936c clean up download view 2020-09-28 15:38:56 -05:00
Isaac Connor ecac5e051a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-28 09:34:14 -04:00
Isaac Connor 0a4a144bbc Merge branch 'location' 2020-09-28 09:33:28 -04:00
Andrew Bauer 699cbed6af add back and refresh buttons to export view 2020-09-27 12:43:12 -05:00
Andrew Bauer 9ea58dc4a1 eslint 2020-09-27 12:16:04 -05:00
Andrew Bauer c1a0afef95 make group view into a modal 2020-09-27 12:12:01 -05: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 386f991364 Merge branch 'master' into location 2020-09-24 19:28:57 -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
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 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 fbc15c8109 Fix FPS Report Interval label 2020-09-22 15:51:44 -04:00
Isaac Connor ed6d5a55a5 put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button 2020-09-22 14:33:26 -04:00
Isaac Connor b1dd42dd8b Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing 2020-09-22 14:05:11 -04:00
Isaac Connor 7196eaf0d0 Minimum value for label position is 0, not 1. 2020-09-22 13:14:25 -04:00
Isaac Connor 2457dcb16f Minimum value for label position is 0, not 1. 2020-09-22 13:12:39 -04:00
Isaac Connor b6541aa1ff Move log export to a generic modal 2020-09-21 13:01:58 -04:00
Andrew Bauer 1d1b0e58d2 consolidate getJson fail callbacks to one function 2020-09-20 08:41:16 -05:00
Andrew Bauer c75f5c68c1 unpopup the log view 2020-09-19 12:59:15 -05:00
Andrew Bauer 0a7848d9d2 remove uneeded state php and js files 2020-09-19 12:36:55 -05:00
Isaac Connor bf29357455 Merge branch 'release-1.34' 2020-09-19 12:01:21 -04:00
Andrew Bauer 7c1ec4f957 convert logout modal to ajax request 2020-09-19 10:44:05 -05:00
Andrew Bauer 03a0e849b8 remove unneeded js from console.js 2020-09-19 10:24:28 -05:00
Andrew Bauer ec20fdf3ad convert function modal to ajax request 2020-09-19 10:18:59 -05:00
Andrew Bauer d2963fe28f convert donate modal to ajax request 2020-09-19 08:55:08 -05:00
Isaac Connor e491f2ee76 Add id's to dropdowns to fix zone edit behaviour. Remove CSP violations 2020-09-17 20:58:53 -04:00
Isaac Connor 8f3b3466af setup onblur function for presetSelector 2020-09-17 20:58:18 -04:00
Isaac Connor 6aa4302fe0 Add EventDiskSpace as a term and add a Debug modal button 2020-09-17 15:17:29 -04:00
Isaac Connor bb4bd935d6 use getBodyTopHTML as it include an error message div. Show db errors with the error message 2020-09-17 15:17:06 -04:00
Andrew Bauer b64bd97a64 whitespace 2020-09-16 18:22:37 -05:00
Andrew Bauer c8c3b75e33
Reload the page after table refresh
This wasn't needed on my machine, but might be on others
2020-09-16 18:21:06 -05:00
Isaac Connor 6b2773ad8c Handle invalid eid more gracefully. 2020-09-16 14:21:03 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Isaac Connor bea23e2241 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-16 09:58:49 -04:00
Isaac Connor c1f872c9aa Reinit chosen on log filters after updating them 2020-09-16 09:58:15 -04:00
Andrew Bauer afdd4702a2 add server modal 2020-09-16 08:30:45 -05:00
Isaac Connor 4fa9237048 Fix eslint 2020-09-16 08:57:44 -04:00
Isaac Connor a430fe1f7a correct EndTime to End Date/Time. EndTime and EndDate terms are also effective 2020-09-15 21:19:10 -04:00
Isaac Connor 32f60631b3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 18:53:42 -04:00
Isaac Connor 81306928b8 Fix scale width and height dropdown actions on cycle 2020-09-15 18:53:39 -04:00
Andrew Bauer 21d4773da9 fix badly formatted line 2020-09-15 13:08:44 -05:00
Andrew Bauer da73ecee08 delete commented line 2020-09-15 13:05:05 -05:00
Andrew Bauer 5f361094bb unpopup frames and alarmframes in export view 2020-09-15 13:01:35 -05:00