Commit Graph

183 Commits

Author SHA1 Message Date
Isaac Connor b1d881b118 Report more saving errors to ui 2021-11-17 18:57:36 -05:00
Isaac Connor a0666e777a Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-17 17:45:47 -05:00
Isaac Connor c37d8eeded spacing and report save errors 2021-11-17 17:45:38 -05:00
Isaac Connor 1fd99424bb Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-05 10:13:41 -04:00
Isaac Connor 16d0e269df WHen saving v4l settings redirect back to watch instead of console. 2021-10-19 12:39:37 -04:00
Isaac Connor 1f04723f3a dbError is supposed to take the sql that caused the error. So pass something to satisfy php 2021-10-05 19:49:42 -04:00
Isaac Connor 2f12615f08 assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving. 2021-09-25 10:33:16 -04:00
Isaac Connor 227e5794fa Merge branch 'master' into add_manufacturer_model_to_monitors 2021-09-08 18:32:46 -04:00
Isaac Connor a311455526 clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save. 2021-08-12 13:42:36 -04:00
Isaac Connor cd3359c3eb spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter. 2021-08-12 12:53:46 -04:00
Isaac Connor 672de6e84f event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it. 2021-08-06 19:15:22 -04:00
Isaac Connor c6209ce460 Store new Model and Manufacturer when saving Monitor 2021-07-07 09:47:00 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Isaac Connor 9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor 95249d5eb4 Merge branch 'release-1.34' 2021-04-12 16:32:57 -04:00
Isaac Connor 2e22cd5c3b Mark snapshot events as Archived 2021-04-08 15:20:44 -04:00
Isaac Connor be0841832e enable reporting saving errors back to web ui. 2021-03-22 12:59:41 -04:00
Isaac Connor d0adaeaabe rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD() 2021-03-21 09:18:12 -04:00
Isaac Connor 28700fd56b Implement saving DecodingEnabled from function view 2021-03-16 12:09:14 -04:00
Isaac Connor 5eae1c0a9f spacing, add code comment 2021-03-13 12:10:55 -05:00
Isaac Connor 11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00
Isaac Connor 4cfe777e93 Fix path to Monitor.php 2021-02-16 11:16:06 -05:00
Isaac Connor c99f43205d add parenthesis for safety 2021-02-18 13:47:27 -05:00
Isaac Connor b58ecca040 Allow RTSPServer to be unselected 2021-02-17 12:07:55 -05:00
Peter Keresztes Schmidt 687ba03eb4 Drop relicts of zma 2021-02-10 13:26:25 +01:00
Isaac Connor 105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor 0dc6b60985 Use new insert function to allow re-use of monitor Ids 2021-02-01 16:44:41 -05:00
Isaac Connor f2fea95f4b Merge branch 'master' into zma_to_thread 2021-01-14 13:02:52 -05:00
Isaac Connor 9a824716b5 Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input 2021-01-12 18:41:24 -05:00
Andrew Bauer 70f73f5475 modernize monitors view 2021-01-11 13:46:50 -05:00
Andrew Bauer 6dcedb584d modernize monitors view 2021-01-05 10:16:51 -06:00
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 &amp; 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