d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -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
3ab542199c
Merge branch 'master' into storageareas
2018-08-13 11:17:04 -04:00
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
5b1f8fbd71
initialize more vars in constructor
2018-08-13 10:01:39 -04:00
1016096a00
spacing
2018-08-13 10:01:27 -04:00
59b0160144
use ++it instead of it++
2018-08-13 10:01:16 -04:00
4670a7f26b
move variables into deeper block
2018-08-13 10:01:04 -04:00
4297d39df6
spacing, code style, remove useless debug logging
2018-08-11 18:49:48 -04:00
b2c9c2961d
spacing, code style, remove useless debug logging
2018-08-11 18:49:30 -04:00
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
17a02d66f7
google code style
2018-08-11 13:35:37 -04:00
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
3b86d9255b
adjust some spacing
2018-08-10 11:16:27 -04:00
744884203c
adjust some spacing
2018-08-10 11:16:20 -04:00
a335eb66de
remove some extra braces
2018-08-10 11:16:04 -04:00
f2525253bb
spacing, remove excess parenthesis etc
2018-08-10 11:15:51 -04:00
185586ecd4
we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist
2018-08-10 11:15:15 -04:00
97a6a28182
You should just mkdir and handle EEXIST because stating first is a race condition
2018-08-10 11:14:41 -04:00
cf5eab4dbc
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-09 12:50:08 -04:00
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
9f183f5df7
google code style, improve debugging, add bandwidth code
2018-08-09 11:23:13 -04:00
2ad4b17d36
Merge branch 'master' into storageareas
2018-08-08 16:24:55 -04:00
037abd4916
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-08 15:11:42 -04:00
d87a41b629
Set button types so that they do things in all browsers.Fix Delete button when translated
2018-08-08 15:11:30 -04:00
23ddc83ad4
fix_2167 ( #2168 )
...
* Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
* fix when gets loaded.
* use for auth, and add Monitor Edit checks to Zone add/delete/edit
* add back the ZM_OPT_USE_AUTH test for being logged in in AppController
* Update permissions code to use
* change quotes
* Update permission code to use
* Use instal of session for systemPermission
* deprecate montiorPermision in session
* use instead of session streamPermission
* move login code back into AppController. Has to be done for every request
* deprecate eventPermission, controlPermission and systemPermission in session.
* handle auth params in query string as well as post
* exit on HUP to free up memory.
* add missing global user
* system should be System
2018-08-08 09:59:46 -04:00
6db55a24d3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-07 11:32:35 -04:00
dbdb9680c0
exit on HUP to free up memory.
2018-08-07 11:32:17 -04:00
328277536e
Update README.md
2018-08-03 10:18:11 -05:00
af7c81bda1
Merge branch 'fix_2167' into storageareas
2018-08-03 11:02:56 -04:00
c8741f1fcc
Merge branch 'fix_2167' of github.com:ConnorTechnology/ZoneMinder into fix_2167
2018-08-03 11:02:47 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
a1c8d1300e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-03 10:27:40 -04:00
b51ff8492b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-03 10:02:53 -04:00
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
e935570a40
Merge branch 'fix_2167' into storageareas
2018-08-02 18:08:54 -04:00
a44df858be
Merge branch 'master' into storageareas
2018-08-02 15:40:44 -04:00
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
c8ed12f573
Update ISSUE_TEMPLATE.md
2018-08-02 09:49:40 -05:00
82833a152e
exit on HUP to free up memory.
2018-08-02 06:53:18 -04:00
3de6b764e2
exit on HUP to free up memory.
2018-08-02 06:52:36 -04:00
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
2c1a3348af
handle auth params in query string as well as post
2018-08-01 12:40:12 -04:00
5b878d5e89
deprecate eventPermission, controlPermission and systemPermission in session.
2018-08-01 12:10:43 -04:00
434c1508bc
Merge branch 'master' into fix_2167
2018-08-01 10:01:51 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer