Commit Graph

16424 Commits

Author SHA1 Message Date
Isaac Connor 2f03ceeccf log referer when unable to authenticate 2020-09-22 13:10:39 -04:00
Isaac Connor 98aad6abbc Make status UNKNOWN be -1 so that zmu -s retains backwards compatibility. Fixes #3048 2020-09-21 14:25:41 -04:00
Isaac Connor a43cbc05af Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output 2020-09-21 13:03:03 -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
Isaac Connor 96474a7d94 Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output 2020-09-21 13:00:03 -04:00
Isaac Connor 94fdddc1e8 Synchronize on space instead of = in zmcontrol.pl command line 2020-09-21 11:56:56 -04:00
Isaac Connor 3e3af0bca5 Fix zmcontrol.pl command line to not use = to match with usage elsewhere 2020-09-21 11:24:17 -04:00
Isaac Connor b16d4045ee Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-21 11:15:41 -04:00
Isaac Connor 861ebedcae Implement a crude view for a failed db connection with a 30 second reload interval. 2020-09-21 11:15:34 -04:00
Andrew Bauer 1d1b0e58d2 consolidate getJson fail callbacks to one function 2020-09-20 08:41:16 -05:00
Andrew Bauer 95808cfafe fixes #3049 2020-09-19 20:53:00 -05:00
Andrew Bauer b34af63479
Merge pull request #3051 from frrad/patch-1
fix typo in gettingstarted.rst
2020-09-19 20:46:07 -05:00
Frederick Robinson e256d4f5f1
Update gettingstarted.rst 2020-09-19 18:18:53 -07: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 e2502f49e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-19 12:00:36 -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 f7cbc2f5e0 remove uneeded setconfig options in redhat specfil 2020-09-19 09:10:16 -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 a058d077bb fix typo 2020-09-18 10:11:58 -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 416de4a068 fix git screwup 2020-09-18 08:56:17 -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 29880cdab3 handle width options['width'] and options['height'] aren't set 2020-09-17 20:57:14 -04:00
Isaac Connor 006cc079c4 Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once. 2020-09-17 20:56:56 -04:00
Isaac Connor 1701089211 Add MonitorId to Zone fields and add Monitor() method 2020-09-17 20:56:21 -04:00
Isaac Connor 42dc4e46b1 add canEdit method to Monitor object 2020-09-17 20:56:04 -04:00
Isaac Connor f61a21fec4 Add modals dir with filterdebug modal 2020-09-17 15:17:53 -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 6a77591237 Add lang for Event DiskSpace and FileSystem ISKSpace 2020-09-17 15:15:28 -04:00
Isaac Connor 4a6743be3f turn off debug 2020-09-17 15:15:13 -04:00
Isaac Connor 123b2a4747 Change Event Diskspace case to not interfere with Filesystem DiskSpace 2020-09-17 15:14:54 -04:00
Isaac Connor 1caaf01502 Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json. 2020-09-17 15:14:09 -04:00
Isaac Connor 5caa7806a7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-17 13:51:40 -04:00
Isaac Connor ef8fb774df Handle no data in setNavBar 2020-09-17 13:51:31 -04:00
Andrew Bauer b3c5a985ed use BindsTo in redhat systemd service file 2020-09-17 09:16:28 -05:00