Isaac Connor
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
Isaac Connor
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
Isaac Connor
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor
a066968aca
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
2018-11-07 12:33:18 -05:00
Isaac Connor
230ce61dc4
fix #2296 by prepending bind with ::
2018-11-07 11:54:18 -05:00
Isaac Connor
0e3eb0df17
remove extra quotes, google code style, update pod docs
2018-11-07 11:26:48 -05:00
Isaac Connor
4107082845
Don't delete default states if there are none
2018-11-07 11:01:49 -05:00
Isaac Connor
0ebcef7324
in poddoc and over needs a =back
2018-11-07 11:01:12 -05:00
Isaac Connor
4993894b27
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-07 10:43:41 -05:00
Isaac Connor
56bdd53757
Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger
2018-11-07 10:40:44 -05:00
Isaac Connor
c0c1247fa0
bump verion to 1.32.2
2018-11-07 10:33:55 -05:00
Andrew Bauer
ec95163810
Add fedora 29 support to buildsystem
2018-11-05 19:35:05 -06:00
Andrew Bauer
d3064e4402
Update zoneminder.spec
2018-11-05 07:06:34 -06:00
Andrew Bauer
b8066e66ed
Update zoneminder.spec
2018-11-05 06:51:08 -06:00
Andrew Bauer
720505cbea
spelling
2018-11-04 17:14:46 -06:00
Andrew Bauer
e6e7069ec0
Merge pull request #2293 from knight-of-ni/rpm-nginx
...
update nginx support on redhat
2018-11-04 17:13:11 -06:00
Andy Bauer
3aee902a96
update nginx support on redhat
2018-11-04 17:11:19 -06:00
Andrew Bauer
6360b84e15
Merge pull request #2288 from connortechnology/add_monitor_status_to_api
...
rough in adding Monitor_Status to Monitors
2018-11-03 20:46:11 -05:00
Andrew Bauer
cac049e2c9
Merge pull request #2291 from pliablepixels/api-updates
...
updated API - streaming/server/storage/other edits
2018-11-03 20:45:52 -05:00
Andrew Bauer
0e6fbe2213
Merge pull request #2286 from ratmole/api-php-notice-fix
...
API - Disable E_NOTICE from php error reporting in cake debug
2018-11-03 20:41:52 -05:00
Andrew Bauer
a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
...
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
Isaac Connor
4b24bf4e36
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
2018-11-02 11:48:35 -04:00
Pliable Pixels
ace1134df1
further reading
2018-11-01 14:40:31 -04:00
Pliable Pixels
86a086c216
server json api typo
2018-11-01 14:13:22 -04:00
Pliable Pixels
14c30eac76
typo
2018-11-01 14:08:09 -04:00
Pliable Pixels
536d9226e0
ptz - clarify this is meta-data
2018-11-01 14:07:53 -04:00
Pliable Pixels
46cd2fc3ff
relocate monitor_status to the right place
2018-11-01 14:04:51 -04:00
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