eba8b3327d
Merge branch 'master' into cleanup_auth
2018-12-11 16:04:42 -05:00
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
6691b5fb52
Include CORS headers when there is a Server defined, instead of requiring there to be more than 1
2018-10-29 12:50:50 -04:00
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
6ed146b4dd
Use Hostname instead of Url in test for CORS access.
2018-10-10 14:01:36 -04:00
918d5fd469
move utility functions for doing get/post requests into functions.php from actions.php
2018-10-09 09:39:04 -04:00
fa55cec12c
fix error when scale is auto
2018-09-14 16:57:28 -04:00
f1442eba90
once we have found a match for our origin, break out of loop
2018-09-14 14:56:26 -04:00
d9b1d3ec11
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
2018-09-14 14:52:33 -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
05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -04:00
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
99a97543f1
Rework generateAuthHash to take a force parameter so that it can be used to generate auth hashes for zmu
2018-06-25 13:43:08 -04:00
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -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
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
dfae6661ab
use isset when determining if a column exists, otherwise we throw warnings
2018-04-25 09:32:40 -04:00
fac3cde1e7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-20 15:23:23 -04:00
3ea39ad417
whitespace
2018-04-20 15:22:45 -04:00
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
e3afa5e309
handle scale not being defined when using mpeg streaming
2018-04-18 11:28:19 -04:00
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -04:00
53ce8c008a
move auth functions into it's own file
2018-04-06 14:36:23 -04:00
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
df3a5b7d58
must reopen the session before destorying it
2018-03-29 19:19:08 -04:00
3fe5bb6fe2
open and close the session around user login
2018-03-29 11:30:20 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
0df59c26b8
fix typo
...
Fix unable to enable camera
2018-03-10 19:48:53 -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
735e36c2a8
split htmlSelect into htmlOptions
2018-02-26 17:08:30 -08:00
464b588f08
add a case for toggle, which are booleans and default them to false
2018-02-26 07:29:49 -08:00
505e726636
turn off debug
2018-02-14 13:51:49 -05:00
a09bf3b097
slightly improve auth debugging
2018-02-14 11:58:00 -05:00
93996402d9
turn off debug
2018-02-02 13:24:07 -05:00
018523134e
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
2018-01-31 14:35:23 -05:00
2ea2f46ec8
braes
2018-01-25 09:13:31 -08:00
a271f1776d
Fix #80 don't escape NULL value when building SQL
2018-01-24 10:35:22 -05:00
9f89ccfa32
revert issue with AUTH_HASH_LOGINS
2018-01-24 07:46:56 -05:00
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
3c55557c77
Handle to val in a filter term
2018-01-11 22:53:53 +01:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
Isaac