15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
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
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04:00
67155e98eb
add debug message when no changes are being made to a monitor
2018-06-11 16:34:40 -04:00
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
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
5f415873d4
Update GroupIds regardless of changes returned from getFormChanges on Monitor save
2018-04-25 09:32:15 -04:00
940c791d4f
GroupIds won't be set if no groups are selected
2018-04-18 12:14:49 -04:00
998d60a4b2
whitespace
2018-04-14 22:26:57 -04:00
140f11fd58
fix clearing groups
2018-04-05 13:10:25 -04:00
2a000cb5f8
fix clearing groups
2018-04-05 13:09:14 -04:00
f8457e04e2
clean out commented out code
2018-03-29 11:30:09 -04:00
a037974e26
Fix automatic server selection
2018-03-21 11:25:42 -07:00
f64ef370c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-20 12:18:42 -07:00
eade5316b9
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
2018-03-20 12:18:07 -07:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
16a2c173cb
fix Column 'Method' cannot be null
2018-03-10 20:29:25 -06:00
ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
...
Fix 2044
2018-03-03 12:49:57 -06:00
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
0312dc3c2d
Add Group saving to Monitor saving
2018-02-27 11:20:52 -08:00
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
c5081d1e4e
drop session before executing filter
2018-02-21 13:54:06 -05:00
b0f755b5fc
put unarchive, archive, delete in a transaction for speed
2018-02-02 12:14:01 -05:00
68521aa0d4
spacing, remove debug lines
2018-02-02 10:27:50 -05:00
c9e32fb344
Check for successful Monitor db Insertion
2018-01-29 10:41:09 -08:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
f2b335c7b2
SORT auto server selection in ascending order
2018-01-28 18:07:01 -08:00
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
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
7165f3cfd8
Add server auto-selection
2018-01-25 08:41:42 -08:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
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
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08:00
773ed11742
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-19 08:17:53 -08:00
484a361af8
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-18 12:40:10 -08:00
004fdbad9b
We don't need to update ZoneCount manually anymore
2018-01-16 09:31:23 -05:00
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
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
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
digital-gnome