Commit Graph

3579 Commits

Author SHA1 Message Date
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
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 b6541aa1ff Move log export to a generic modal 2020-09-21 13:01:58 -04:00
Isaac Connor cbbdfdbd43 Introduce generic getModal and manageModalBtns 2020-09-21 13:00:55 -04:00
Isaac Connor 2ff2fbecd9 Remove fieldset styling. We were conflicting with bootstrap 2020-09-21 13:00:29 -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
Andrew Bauer a3c0e160a2 convert state modal to ajax request 2020-09-19 12:36:04 -05:00
Isaac Connor bf29357455 Merge branch 'release-1.34' 2020-09-19 12:01:21 -04:00
Isaac Connor 3492582b98 add missing css for settings popup 2020-09-19 12:00:32 -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
Andrew Bauer 467e75a11c convert eventdetail function to php file 2020-09-18 11:03:20 -05:00
Andrew Bauer 2757b74957 convert servermodal function to php file 2020-09-18 10:34:33 -05:00
Andrew Bauer 10119dc609 convert storage function to php file 2020-09-18 10:02:02 -05:00
Andrew Bauer 1b2f0514b9 convert delconfirm function to php file 2020-09-18 09:43:29 -05:00
Andrew Bauer 6e6b9a464b convert enoperm function to php file 2020-09-18 09:24:23 -05:00
Andrew Bauer bc7cadcc73 convert optionhelp function to php file 2020-09-18 08:35:21 -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
Isaac Connor ef8fb774df Handle no data in setNavBar 2020-09-17 13:51:31 -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 e5cf74c3d8 remove unused and potentially conflicting id's 2020-09-16 08:54:13 -05: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
Andrew Bauer 40eb60f644 unpopup monitor config from export view 2020-09-15 12:52:13 -05:00
Andrew Bauer fd7d5317af create getCSRFinputHTML function 2020-09-15 11:06:16 -05:00
Andrew Bauer 798557604f
remove old pagination var from events.php 2020-09-15 10:58:42 -05:00
Andrew Bauer 845815b566 unpopup call to image view 2020-09-15 10:51:45 -05:00
Andrew Bauer be150479a1 unpopup Max Score link in events view 2020-09-15 10:37:05 -05:00
Andrew Bauer df443326ea unpopup monitor link in events view 2020-09-15 10:31:14 -05:00
Andrew Bauer b9d95f0833 fix typo 2020-09-15 09:50:53 -05:00
Andrew Bauer 33ef700dda Cause links in events use eventdetail modal 2020-09-15 09:49:03 -05:00
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05:00
Isaac Connor 9e12090348 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-15 10:00:24 -04:00
Andrew Bauer 121671327c call eventdetail modal rather than popup 2020-09-15 08:55:32 -05:00
Andrew Bauer 1d3ce1c916
must define sortQuery as a global in export view 2020-09-15 08:27:44 -05:00
Andrew Bauer ba900dd9dc change table type to increase row padding 2020-09-14 14:07:49 -05:00
Andrew Bauer fb85d6f79c rough in eventdetail modal 2020-09-14 13:47:09 -05:00
Isaac Connor 691be74304 fix th text-align on tables in options 2020-09-14 14:09:41 -04:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor d02a61e715 change will to might 2020-09-14 14:03:55 -04:00
Andrew Bauer cc7b65e8aa eslint 2020-09-14 10:31:44 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Andrew Bauer 0a0b555c4c refresh table after archive or unarchive 2020-09-13 11:32:28 -05:00
Andrew Bauer 29710f67ac fix table refresh after delete 2020-09-13 11:25:31 -05:00
Andrew Bauer c4c4551436 replace no permission alerts with enoperm() 2020-09-13 11:09:15 -05:00
Andrew Bauer 54e8d1352a add enoperm js function 2020-09-13 11:04:04 -05:00
Andrew Bauer 096f4a446f Use Ajax to load delete confirm modal 2020-09-13 10:39:51 -05:00
Andrew Bauer 7e55dd14a2 eslint 2020-09-13 08:52:52 -05:00
Andrew Bauer 951afc669f eslint 2020-09-13 08:33:47 -05:00
Andrew Bauer 1599bc4c14 load stats on deman via ajax 2020-09-13 07:32:49 -05:00
Andrew Bauer 56aa906dd8 call getStatsTableHTML in frames view 2020-09-12 11:55:24 -05:00
Andrew Bauer 5d914d8b01 convert stats table to a function 2020-09-12 11:53:53 -05:00
Andrew Bauer f31b3bfc59 add xhtmlFooter to stats view 2020-09-12 11:48:33 -05:00
Andrew Bauer 0ad41fc8d4 rough in error no permisson modal 2020-09-12 08:37:57 -05:00