Commit Graph

125 Commits

Author SHA1 Message Date
Andrew Bauer 8d74354fcb
Merge pull request #2242 from connortechnology/cleanup_auth
Cleanup auth
2018-12-12 20:53:24 -06:00
Isaac Connor eba8b3327d Merge branch 'master' into cleanup_auth 2018-12-11 16:04:42 -05:00
Andrew Bauer 4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
Introduce get body top html
2018-12-11 09:35:54 -06:00
Andrew Bauer e327ad100e fix WebSite camera startup issue 2018-12-01 17:03:50 -06:00
Isaac Connor 702143e51b Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.

This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor a3d0cb42ea Move GOOGLE RECAPCHA to includes/auth.php, clean login actions. 2018-10-09 10:05:50 -04:00
Isaac Connor 918d5fd469 move utility functions for doing get/post requests into functions.php from actions.php 2018-10-09 09:39:04 -04:00
Isaac Connor 4b30ea7877 cleanup, whitespace 2018-08-31 10:35:23 -04:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Isaac Connor 4aa289cd66 fix reCaptcha failure still allowing login 2018-07-12 11:44:20 -04:00
Isaac Connor 67155e98eb add debug message when no changes are being made to a monitor 2018-06-11 16:34:40 -04:00
Isaac Connor 9050ffaf92 spacing, remove some debug lines 2018-06-06 12:57:35 -04:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor 5f415873d4 Update GroupIds regardless of changes returned from getFormChanges on Monitor save 2018-04-25 09:32:15 -04:00
Isaac Connor 940c791d4f GroupIds won't be set if no groups are selected 2018-04-18 12:14:49 -04:00
Isaac Connor 998d60a4b2 whitespace 2018-04-14 22:26:57 -04:00
Isaac Connor 140f11fd58 fix clearing groups 2018-04-05 13:10:25 -04:00
Isaac Connor 2a000cb5f8 fix clearing groups 2018-04-05 13:09:14 -04:00
Isaac Connor f8457e04e2 clean out commented out code 2018-03-29 11:30:09 -04:00
Isaac Connor a037974e26 Fix automatic server selection 2018-03-21 11:25:42 -07:00
Isaac Connor f64ef370c9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-20 12:18:42 -07:00
Isaac Connor eade5316b9 Move Monitor delete logic to the object. Don't fixSequences when deleting monitors 2018-03-20 12:18:07 -07:00
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Andrew Bauer 16a2c173cb
fix Column 'Method' cannot be null 2018-03-10 20:29:25 -06:00
Andrew Bauer ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
Fix 2044
2018-03-03 12:49:57 -06:00
Isaac Connor 3fc7ebee6c Merge ../ZoneMinder.master into storageareas 2018-03-03 09:32:23 -08:00
Isaac Connor 0312dc3c2d Add Group saving to Monitor saving 2018-02-27 11:20:52 -08:00
Isaac Connor bfbefc4c32 Use our new Control object to do the saving instead of a generic function 2018-02-26 07:31:48 -08:00
Isaac Connor c5081d1e4e drop session before executing filter 2018-02-21 13:54:06 -05:00
Isaac Connor b0f755b5fc put unarchive, archive, delete in a transaction for speed 2018-02-02 12:14:01 -05:00
Isaac Connor 68521aa0d4 spacing, remove debug lines 2018-02-02 10:27:50 -05:00
Isaac Connor c9e32fb344 Check for successful Monitor db Insertion 2018-01-29 10:41:09 -08:00
Isaac Connor 2dcb0d183f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-28 18:07:33 -08:00
Isaac Connor f2b335c7b2 SORT auto server selection in ascending order 2018-01-28 18:07:01 -08:00
Isaac Connor 8a4b17fb50 turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable 2018-01-28 15:13:57 -05:00
Isaac Connor 356015a492 Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-25 08:42:08 -08:00
Isaac Connor 7165f3cfd8 Add server auto-selection 2018-01-25 08:41:42 -08:00
Isaac Connor 994766fd50 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-22 13:25:38 -08:00
Isaac Connor 924fa80ea6 When renaming a monitor, take change of storage area into account when creating dirs and symlinks 2018-01-22 11:42:07 -05:00
Isaac Connor 9b7fee03c7 Add Server auto-selection 2018-01-19 11:00:46 -08:00
Isaac Connor 773ed11742 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-19 08:17:53 -08:00
Isaac Connor 484a361af8 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-18 12:40:10 -08:00
Isaac Connor 004fdbad9b We don't need to update ZoneCount manually anymore 2018-01-16 09:31:23 -05:00
Isaac Connor 2643ac9f97 fix a quoting problem that prevented saving config 2017-12-12 11:16:08 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -05:00
digital-gnome fb952179cd Fix delete filter (#2010)
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00