Commit Graph

113 Commits

Author SHA1 Message Date
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
Andrew Bauer
add3682128 fix spelling 2018-07-05 08:00:24 -05:00
Andrew Bauer
422d2d6dba set telemetry default to NO
This is the first step for GDPR compliance. A future pr will add a prompt which explains what the telemetry pr is for and whether they want to turn it on.
2018-06-22 08:10:48 -05:00
Andrew Bauer
3ffd30ffbd Allow selection of different source column filtering on the console (#2132) 2018-06-20 11:12:43 -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
c7f672fabd SIGNAL_CHECK_POINTS is now a per-monitor setting 2018-04-19 09:59:10 -04:00
Pliable Pixels
95eb1d3045 merged master storage areas, resolved conflicts 2018-03-29 08:51:35 -04:00
Pliable Pixels
990d60926e #92 new key 2018-03-29 08:47:55 -04:00
Isaac Connor
5792021ee3 Merge branch 'storageareas' into fugro 2018-01-10 15:08:28 -05:00
Isaac Connor
f14859d7d0 Add ZM_STATS_UPDATE_INTERVAL 2018-01-10 13:20:24 -05:00
Isaac Connor
148e21d707 fugro 2017-12-21 21:46:21 -05:00
digital-gnome
0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -05:00
Isaac Connor
e6c0add17e add ZM_BANDWIDTH_DEFAULT 2017-10-12 12:09:05 -04:00
Isaac Connor
09242d72b3 implement alternate ports for streaming 2017-10-05 16:05:41 -04:00
Isaac Connor
676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Andrew Bauer
ac5d1738ea allow changing of the timestamp char code delimeter (#1972) 2017-08-21 11:27:11 -04:00
Isaac Connor
085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer
bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor
7d6f85f9ea Merge ../ZoneMinder.connortechnology 2017-06-02 20:18:16 -04:00
Isaac Connor
d910bcf121 fix quoting on config 2017-06-02 20:18:05 -04:00
Isaac Connor
7b8222f73b fix type for WEB_EVENT_DISK_SPACE to boolean. 2017-06-02 20:17:08 -04:00
Isaac Connor
dcf7c7f015 put back requires 2017-05-30 19:52:19 -04:00
Isaac Connor
0bb2bed32c remove blank lines, do some better escaping 2017-05-30 19:47:35 -04:00
Isaac Connor
cca2c624f9 fix spelling mistake 2017-05-30 19:42:38 -04:00
Isaac Connor
845ef6c05a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-30 10:22:17 -04:00
Isaac Connor
b948bc5403 fix a few extra ) 2017-05-30 10:21:34 -04:00
Isaac Connor
32daa4faed Merge branch 'master' into storageareas 2017-05-30 10:21:01 -04:00
Isaac Connor
b979712892 fix inconsistent whitespace 2017-05-30 10:01:02 -04:00
Isaac Connor
3c9d8f4ec6 Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time. 2017-05-30 09:44:43 -04:00
Isaac Connor
86361b59c7 convert double quotes to single quotes 2017-05-26 14:17:28 -04:00
Isaac Connor
0c25cecb93 Fix some spacing 2017-05-26 13:36:20 -04:00
Isaac Connor
368567335b remove some quotes 2017-05-26 13:33:34 -04:00
Isaac Connor
a2bf5df2d4 remove some quotes 2017-05-26 13:27:55 -04:00
Isaac Connor
2a2d667afb remove some quotes 2017-05-26 13:27:06 -04:00
Isaac Connor
f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Andrew Bauer
200f92b1ad make zmexport not rely on symlinks in the webroot (#1888)
* make zmexport not rely on symlinks in the webroot

* add archive view
2017-05-17 11:30:39 -04:00
Isaac Connor
fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Andrew Bauer
e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -05:00
Isaac Connor
3cd9e46df9 Merge branch 'knnniggett-csrf' into storageareas 2017-03-28 20:44:38 -04:00
Andy Bauer
4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05:00
SteveGilvarry
2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Isaac Connor
99e823ef33 Merge branch 'zmtelemetry_improvements' into storageareas 2017-01-08 11:04:59 -05:00
Isaac Connor
146a772a21 move ENDPOINT to hidden category 2017-01-06 19:49:03 -05:00
Isaac Connor
db1a6f9b3b fix to remove qqq 2017-01-05 11:24:27 -05:00
Isaac Connor
0c34aa9830 Merge branch 'zmtelemetry_improvements' into storageareas 2017-01-04 12:25:01 -05:00
Isaac Connor
cf9747054c add ZM_TELEMETRY_INTERVAL AND ENDPOINT 2017-01-04 12:22:01 -05:00
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00