Pliable Pixels
cd8d609e84
initial multi-server/storage changes
2018-11-01 14:00:09 -04:00
Pliable Pixels
2953ff4db4
header level fix
2018-11-01 13:40:07 -04:00
Pliable Pixels
37b2da59ce
added streaming interface docs
2018-11-01 13:30:08 -04:00
Isaac Connor
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
Isaac Connor
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
Isaac Connor
589b6f3eef
add further note about needing h264 passthrough
2018-10-31 11:35:06 -04:00
Isaac Connor
69f7d36729
Make it clear that audio recording is only for ffmpeg input type
2018-10-31 11:34:30 -04:00
Isaac Connor
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
ratmole
2b0df3e4e2
API - Disable E_NOTICE from php error reporting in cake debug
...
Using zmNinja, the API reports E_NOTICE errors
Notice (8): compact(): Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
and zmNinja will not work...
there is a better way, but i think disabling E_NOTICE error is way easier
see: https://github.com/ZoneMinder/zoneminder/pull/2269
2018-10-31 10:17:36 +02:00
Chris Kampmeier
a1937d9885
Fixes for a couple issues in the Ubuntu guide ( #2285 )
...
* Xenial needs the ppa:iconnor/zoneminder repo
Otherwise, trying to install the zoneminder package fails with an unmet
dependency on php-apc.
See https://forums.zoneminder.com/viewtopic.php?t=27638 for details.
* Add necessary modules before configuring Apache
When you add the zoneminder configuration before enabling mod_rewrite,
subsequent commands (like the one to enable mod_cgi) give you an error
like:
AH00526: Syntax error on line 37 of /etc/apache2/conf-enabled/zoneminder.conf:
Invalid command 'RewriteEngine', perhaps misspelled or defined by a module not included in the server configuration
2018-10-30 18:35:50 -04:00
Isaac Connor
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
Andrew Bauer
f790eacc92
Merge pull request #2273 from connortechnology/fix_rce
...
use json_encode/decode instead of serialize/unserialize to pass onvif…
2018-10-30 07:06:45 -05:00
Andrew Bauer
073193e410
Merge pull request #2281 from connortechnology/fix_2279_delete_camera_through_api
...
Fix 2279 delete camera through api
2018-10-30 07:06:14 -05:00
Isaac Connor
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
Isaac Connor
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
Isaac Connor
d85a02be63
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-29 11:13:44 -04:00
Isaac Connor
9a2d58adce
We don't store all the permissions in the session anymore. We just use the global user object
2018-10-29 11:03:03 -04:00
Isaac Connor
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
Andrew Bauer
32e4b3ce25
Merge pull request #2278 from mnoorenberghe/patch-2
...
Document /api/monitors/daemonStatus/
2018-10-29 08:56:12 -05:00
Matt N
0d1f8aaf03
Document /api/monitors/daemonStatus/
2018-10-28 17:15:39 -07:00
Isaac Connor
aaeb30a72f
Move license down to perldocs at bottom. Remove unecessary line feeds and spaces
2018-10-28 17:50:22 -04:00
Isaac Connor
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
Isaac Connor
3f34593c82
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-25 11:24:42 -04:00
Isaac Connor
349693e27d
Add a missing comma
2018-10-25 11:24:23 -04:00
Damir Merdan
d0080684b8
Bosnian translation ( #2266 )
...
* Zoneminder bosnian translation
Hi,
this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too
* Delete BA_ba.php
* Bosnian translation
80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
2018-10-24 13:52:32 -04:00
Isaac Connor
bca2b30518
Add a test for channel layout and correct it if not set
2018-10-24 13:45:33 -04:00
Isaac Connor
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00
Isaac Connor
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
Isaac Connor
2024df4393
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
2018-10-24 09:49:56 -04:00
raTmole
18850d8779
API getVersion Fix -> Undefined variable: eTagMatches... ( #2268 )
...
see https://github.com/cakephp/cakephp/issues/12536
2018-10-23 07:58:07 -04:00
Isaac Connor
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
Isaac Connor
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
Isaac Connor
7b69bc4292
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
2018-10-22 16:13:55 -04:00
Isaac Connor
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
Isaac Connor
ccd64b0fae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-22 14:21:34 -04:00
Isaac Connor
7e4c54fec0
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
2018-10-22 13:54:27 -04:00
Isaac Connor
0f14df64e2
google code style and whitespace
2018-10-22 10:41:27 -04:00
Isaac Connor
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
Isaac Connor
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
Isaac Connor
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
Isaac Connor
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
Isaac Connor
3237a10d0a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-10-20 11:36:45 -04:00
Isaac Connor
8878397622
fix spacing
2018-10-20 11:36:25 -04:00
Isaac Connor
530a53f138
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-19 15:02:31 -04:00
Isaac Connor
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
Isaac Connor
17a5519dd6
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. ( #2264 )
2018-10-19 13:39:37 -04:00
Isaac Connor
f9b1453705
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
2018-10-19 10:59:16 -04:00
Isaac Connor
23fd5db5c8
fix #2265 extra graphics in url
2018-10-19 10:06:51 -04:00
Isaac Connor
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
Isaac Connor
4fdac25ae1
remove blank last line
2018-10-18 09:20:15 -04:00