48c9c2b6c0
Merge branch 'add_monitor_status_to_api' into storageareas
2018-10-31 14:47:52 -04:00
eb6d978927
Merge branch 'master' into storageareas
2018-10-31 14:47:43 -04:00
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
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
80cfb02570
Merge branch 'warn_colour_when_disabled' into storageareas
2018-10-30 12:05:47 -04:00
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
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
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
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
34d6ec40a1
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-10-29 12:52:40 -04:00
bc4fada34c
Merge branch 'fix_2279_delete_camera_through_api' into storageareas
2018-10-29 12:52:27 -04:00
461ce3c1f8
Merge branch 'master' into storageareas
2018-10-29 12:52:06 -04: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
d85a02be63
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-29 11:13:44 -04:00
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
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
32e4b3ce25
Merge pull request #2278 from mnoorenberghe/patch-2
...
Document /api/monitors/daemonStatus/
2018-10-29 08:56:12 -05:00
0d1f8aaf03
Document /api/monitors/daemonStatus/
2018-10-28 17:15:39 -07:00
aaeb30a72f
Move license down to perldocs at bottom. Remove unecessary line feeds and spaces
2018-10-28 17:50:22 -04:00
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -04:00
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
3f34593c82
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-25 11:24:42 -04:00
349693e27d
Add a missing comma
2018-10-25 11:24:23 -04:00
d025adab6d
Need to load Config Categories in options save
2018-10-25 09:13:07 -04:00
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
ed50856d40
Merge branch 'master' into storageareas
2018-10-24 13:45:54 -04:00
bca2b30518
Add a test for channel layout and correct it if not set
2018-10-24 13:45:33 -04:00
c48ce09068
Turn back on ffmpeg debug logging
2018-10-24 13:11:09 -04:00
9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
15f89c4b50
Turn ffmpeg logging back on
2018-10-24 12:44:14 -04:00
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
875bc3caf9
Merge branch 'master' into storageareas
2018-10-24 10:17:27 -04:00
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
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
18850d8779
API getVersion Fix -> Undefined variable: eTagMatches... ( #2268 )
...
see https://github.com/cakephp/cakephp/issues/12536
2018-10-23 07:58:07 -04:00
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
7b69bc4292
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
2018-10-22 16:13:55 -04:00
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
ccd64b0fae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-22 14:21:34 -04:00
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
0f14df64e2
google code style and whitespace
2018-10-22 10:41:27 -04:00
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
Isaac Connor
Chris Kampmeier
Andrew Bauer
Matt N
Damir Merdan
raTmole
Isaac Connor
Isaac Connor