Commit Graph

3582 Commits

Author SHA1 Message Date
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