Commit Graph

140 Commits

Author SHA1 Message Date
Isaac Connor 5ab1126260 Merge branch 'storageareas' into zma_to_thread 2018-10-20 17:31:14 -04:00
Isaac Connor e268264761 Merge branch 'cleanup_auth' into storageareas 2018-10-09 10:24:32 -04: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 c9b4f14171 fix deleting events 2018-09-04 09:57:32 -04:00
Isaac Connor 672b4affe1 Merge branch 'storageareas' into zma_to_thread 2018-08-31 19:05:22 -04:00
Isaac Connor 2858564155 Merge branch 'master' into storageareas 2018-08-31 16:06:13 -04:00
Isaac Connor 4b30ea7877 cleanup, whitespace 2018-08-31 10:35:23 -04:00
Isaac Connor 4e32089a48 Merge branch 'master' into storageareas 2018-08-30 14:51:27 -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 d768f5f7fc Merge branch 'master' into storageareas 2018-08-13 15:35:55 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -04:00
Isaac Connor 026390ccd8 Merge branch 'master' into storageareas 2018-08-13 15:26:29 -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 979b31ffc3 Merge branch 'storageareas' into zma_to_thread 2018-08-11 10:08:30 -04:00
Isaac Connor d50e95fe9b redirect to montage instead of montagereview 2018-07-31 16:46:36 -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 f6139d33ed Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:25:11 -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 cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -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 4b7ddd81bf Merge branch 'storageareas' into zma_to_thread 2018-02-02 14:24:02 -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 3ce46d3fed Merge branch 'storageareas' into zma_to_thread 2018-01-29 15:55:05 -05:00
Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	web/includes/Monitor.php
	web/skins/classic/views/js/add_monitors.js
	web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -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