Commit Graph

151 Commits

Author SHA1 Message Date
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor da8d96ddda Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request 2020-12-10 16:24:09 -05:00
Isaac Connor cf08010ebe Fix redirect on zone editing 2020-11-18 13:04:56 -05:00
Isaac Connor fe733fe1e6 Must use & instead of & in filter redirect 2020-11-11 17:39:37 -05:00
Isaac Connor dda1decfb1 When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes 2020-11-03 11:45:22 -05:00
Matt N 6e3eb922e0
Use relative symlinks for monitor event directories
This way the link continues to work from backups and after the user moves ZM data to a new directory.
2020-11-01 14:55:08 -08:00
Andrew Bauer c3a98c1f44 replace shutdown form submit with ajax 2020-10-14 10:03:33 -05:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Andrew Bauer 0f263407a5 make redirect conditional on previous view 2020-10-12 10:32:25 -05:00
Isaac Connor 630d9011f3 Fix redirect when saving users 2020-10-10 09:48:09 -04:00
Isaac Connor 624006022c Use a redirect to get rid of post on reload 2020-10-07 11:59:11 -04:00
Andrew Bauer 1ef1b48c71 remove warnings used for testing 2020-10-03 07:08:04 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Isaac Connor bc5002515e remove debug 2020-10-02 15:56:50 -04:00
Andrew Bauer 186b8ac947 convert x10 device view to a modal 2020-10-01 15:52:33 -05:00
Andrew Bauer 928fa67fce redirect to previous view after user perm changes 2020-10-01 10:45:44 -05:00
Isaac Connor aa7ba44ed9 Use ->zmaControl instead of invalid zmaControl(). the old zmaControl takes a mid, not a monitor object 2020-09-29 16:48:22 -04:00
Andrew Bauer 3b46ebacae remove warning used for testing 2020-09-27 12:20:09 -05:00
Andrew Bauer c1a0afef95 make group view into a modal 2020-09-27 12:12:01 -05:00
Andrew Bauer 2d8349073d redirect to controlcaps after saving a control 2020-09-26 14:31:59 -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 0aa0452b7e Use a redirect instead of just changing the view on monitor save. This fixes the reload issue 2020-09-22 14:05:37 -04: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 2757b74957 convert servermodal function to php file 2020-09-18 10:34:33 -05: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
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Isaac Connor 47971bb8f5 Update function action to use Monitor object 2020-09-03 18:21:08 -04:00
Isaac Connor d0f1a2af80 Since monitor edit is no longer a popup, we need to redirect to console instead of none. 2020-08-28 10:22:28 -04:00
Isaac Connor b458a7c893 Redirect after save so that a reload doesn't redo the post 2020-08-27 17:20:24 -04:00
Andrew Bauer 8ba91db1fb make logout view a modal 2020-08-26 16:28:11 -05:00
Isaac Connor e4425d7565 Merge branch 'master' into filter_pre_post 2020-08-17 12:56:20 -04:00
Isaac Connor 4c8f96b786 Update saving action to use our ORM methods 2020-07-25 14:28:01 -04:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor 93b0552ed7 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:18:45 -04:00
Isaac Connor f73cb3bebe Don't start filter if the command was execute 2020-06-17 13:36:28 -04:00
Isaac Connor f06dc3f171 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-04-23 15:16:22 -04:00
Isaac Connor e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor d0e83fcfcb handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha 2020-04-21 09:19:29 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -04:00
Isaac Connor f81cfc0513 add 1 month as an option to the version popup dropdown 2020-04-04 11:46:31 -04:00
Isaac Connor 599960ef05 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-03-28 10:09:13 -04:00
Isaac Connor c3bcdcff64 Use zm_session_start instead of session_start 2020-03-27 14:30:42 -04:00
Isaac Connor 50700031b1 Use zm_session_start instead of session_start 2020-03-27 13:05:12 -04:00
Isaac Connor af36cc3e52 Fix starting and stopping zmcontrol processes across servers. 2020-03-26 13:57:00 -04:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor 1a87eb40bd Fixes #2841 and maintains login through password change 2020-02-19 16:55:38 -05:00
Isaac Connor 1c2f2657d2 We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha 2020-02-04 16:41:19 -05:00