aa74660aa4
Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details
2016-11-03 23:08:05 -07:00
749a90f199
Add additional details to increasing mapped memory.
...
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.
Also filtered the output of df to focus our attention on the only mount
points that matter here.
2016-11-03 22:43:07 -07:00
60794fab1e
Change CREATE_ANALYSIS_IMAGES Help text
...
The existing help text didn’t fully explain how blobs play a part in
this functionality.
2016-11-03 15:58:16 -07:00
28b18066a9
Fix name of OPT_USE_AUTH option in getting started guide.
2016-08-29 20:34:54 -04:00
872adc1c62
Merge pull request #1578 from erelson/patch-2
...
Minor API doc error fixes
2016-08-15 10:02:57 -04:00
3a804a0d0c
Update definemonitor.rst
2016-08-06 16:34:00 -05:00
b822deeb8c
Minor API doc error fixes
2016-08-02 10:08:08 -07:00
24aeb91ef2
Merge pull request #1558 from onlyjob/spellcheck
...
spellcheck/codespell
2016-07-30 00:35:10 +10:00
dc916bba2c
case typo
2016-07-23 08:04:46 -04:00
45a62dc8d8
Added example of configs API edit
2016-07-23 08:03:15 -04:00
f1acc52913
spellcheck/codespell
2016-07-14 00:30:39 +10:00
5811ba7eda
Swap to apt-get for debian
2016-07-05 23:10:03 +10:00
3a40f39d83
Fix 14.04 php.ini location and some more formatting issues
2016-07-05 07:52:37 +10:00
219289ee20
Consistency changes
2016-07-05 07:15:01 +10:00
b2d1d688cc
Updates to Ubuntu and Debian install guides
2016-07-03 20:21:13 +10:00
e0c5b2a78f
added consoleEvents API
2016-05-19 15:15:48 -04:00
13feb96811
added alarm apis
2016-05-19 15:06:41 -04:00
859a55e1ef
updated documentation to include runstates
2016-04-13 12:54:22 -04:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
d412e8dc5c
Update redhat.rst
2016-03-25 07:54:37 -05:00
0e54831072
Swapping back to vi as default editor
2016-03-24 15:15:58 +00:00
2ede18a614
Minor improvements to documentation
2016-03-21 22:47:45 +00:00
b11f3bce53
Assume this was meant to be Asterisk, not Astericks.
2016-03-19 15:25:17 +00:00
fe46785e94
Update redhat.rst
2016-03-15 07:33:40 -05:00
68a5e78efc
Update redhat.rst
2016-03-15 07:30:31 -05:00
dcdb879637
Update redhat.rst
2016-03-15 07:24:15 -05:00
4581379d45
Update redhat.rst
...
minor edits
2016-03-15 07:21:34 -05:00
b7259b973a
first formatting pass
2016-02-28 12:54:21 -06:00
35d013136f
add redhat instructions to readthe docs
2016-02-28 12:27:04 -06:00
c138914edd
Merge pull request #1251 from tikismoke/patch-1
...
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
2fc1fc4380
use debian control file to auto-install deps
2016-02-22 09:18:46 -06:00
918407bcae
Merge pull request #1248 from pliablepixels/documentation
...
updated documentation for ubuntu
2016-02-22 09:05:53 -06:00
0f63f4357d
sphinx: fix warning "Title underline too short".
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 21:06:21 +11:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
6de2ab504c
Explain ZM_SERVER_HOST in multiserver documentation
2016-02-03 12:40:30 -06:00
f7bc8c7f0d
Update gettingstarted.rst
...
Correct MODECT by NODECT if using zmTrigger
2016-01-26 20:14:49 +01:00
680ab0236c
updated ubuntu instructions
2016-01-24 07:47:25 -05:00
0ef6d55e8f
resolves #1231 - ubuntu package from source instructions added
2016-01-22 09:39:19 -05:00
ea99b2a62a
Move design notes out of the image. Assign Red and Green colors to Storage & dB Servers in the diagram.
2016-01-01 09:20:11 -06:00
d5ec34889e
Merge pull request #1211 from SteveGilvarry/multiserver-docs
...
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
fa8574c3d1
Modify network topology, consistency changes
2015-12-31 10:24:34 -06:00
072c11fa82
Fix image border
2015-12-31 16:53:38 +11:00
15fbf587db
Fix heading indentation
2015-12-31 16:45:22 +11:00
251d73ffe0
Edit Toc
2015-12-31 16:40:49 +11:00
3c2c393de6
Initial draft of Multi-server install docs
2015-12-31 16:24:56 +11:00
8dc7b3cee1
Merge branch 'master' into multi-server
2015-12-24 15:13:35 -05:00
abda4411e9
Revert to Default Theme, RTD will use their own and local builds default sphinx theme
2015-12-23 19:34:31 +11:00
bcb18b927b
mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf
2015-12-21 13:05:56 -05:00
70cac99e17
fix claim that live view must be done on host server
2015-12-21 13:03:52 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
6ccf36bc77
updated mobile app info
2015-12-20 14:55:48 -05:00
cbea550d70
custom theming for ZM
2015-12-19 16:53:47 -05:00
c4bdb127ce
fixed custom style breaking rtd theme
2015-12-19 16:53:30 -05:00
2763c3d92e
deleted
2015-12-19 13:40:21 -05:00
3fe64f8ce6
rtd theme
2015-12-19 13:38:54 -05:00
b78deb192b
Add some documentation on Multi-Server
2015-12-19 20:51:19 +11:00
b444061cc6
removed -master from ppa - when 1.29 releases it will be stable
2015-12-18 15:11:05 -05:00
511421bff1
rewrite
2015-12-18 15:08:56 -05:00
9e2b1ba3cb
remove hardcoded version
2015-12-18 15:08:40 -05:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
f13dddb719
Update api.rst
2015-09-22 09:26:09 -05:00
08e04afcd2
fixed security instructions with curl
2015-09-22 07:39:27 -04:00
78cf7f1cf5
Merge pull request #1044 from schrorg/privacy-zone-docs
...
Add Documentation for Privacy zones
2015-08-29 08:16:25 -05:00
e822265512
Add Documentation for Privacy zones
2015-08-29 10:06:56 +02:00
d014a34b9a
added note about potential Perl and PHP time translation conflict with filters
2015-08-28 15:55:16 -04:00
b798dfadbc
Merge branch '1013-document-migration' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-1013-document-migration
...
Conflicts:
docs/userguide/filterevents.rst
2015-08-24 09:48:40 -05:00
cee933225f
formatting
2015-08-23 18:41:13 -04:00
6045acc2ac
content update
2015-08-23 16:51:37 -04:00
65c5d41f7c
content update
2015-08-23 16:41:29 -04:00
7f23f47aea
added deprecation notice
2015-08-23 16:21:05 -04:00
7253e837f3
content update
2015-08-23 16:15:23 -04:00
16ff2093a1
comtent update
2015-08-23 15:58:40 -04:00
52d5aa0c70
comtent update
2015-08-23 15:19:51 -04:00
81d6b0f023
comtent update
2015-08-23 15:16:56 -04:00
5716b0e1ee
merged content into camera control
2015-08-23 14:20:58 -04:00
25e7702de7
Merged control camera and controlling monitors into one document - they both talk about PTZ
2015-08-23 14:19:54 -04:00
e7e2c92b95
images for define monitor doc
2015-08-23 14:13:44 -04:00
0dcf38abc3
content
2015-08-23 14:13:11 -04:00
3ef7250d3e
Aligned ubuntu install with iconnors post about changes in the forum
2015-08-23 13:20:04 -04:00
042e9533cf
Added an explanation of control protocols work
2015-08-23 12:22:27 -04:00
3188d67e14
Update filterevents.rst
...
more readable on RTD
2015-08-23 15:29:46 +02:00
f9347501f9
update doc
...
make it more readable on readthedoc
2015-08-22 19:31:54 +02:00
a63c0a26b8
content update
2015-08-17 16:21:24 -04:00
2ca3ca8d50
added missing zone images
2015-08-17 15:42:49 -04:00
c6e2914228
Added system diagram
2015-08-17 15:30:00 -04:00
e6061d53b3
Clarified mysql sleep is only needed for ubuntu 14.x and below
2015-08-16 15:13:28 -04:00
2232b6b68b
Updated API to add security notes
2015-08-16 15:05:15 -04:00
1c82f57ba3
Made content same as github README.md contributing
2015-08-16 14:49:44 -04:00
762e3eddc9
Updated mobile with correct info
2015-08-16 13:26:05 -04:00
71e19f48e8
Content update
2015-08-16 05:34:00 -04:00
199795a67d
new content
2015-08-15 16:05:02 -04:00
53d3050e78
content updates
2015-08-15 11:57:03 -04:00
f77d0eda22
content updates
2015-08-15 11:56:08 -04:00
58f86c03fa
For future use
2015-08-14 20:28:31 -04:00
71b82ac84a
ZM Developer notes for review in red
2015-08-14 20:28:03 -04:00
1ccc127d72
Template for a custom style for future use
2015-08-14 20:27:44 -04:00
7e24cbebd1
Completed ubuntu package install instructions
2015-08-14 20:00:11 -04:00
cd6c2a5763
Updated screenshot
2015-08-14 19:59:47 -04:00
Ian
Don Law
Isaac Connor
Andrew Bauer
Eric Relson
Steve Gilvarry
Pliable Pixels
Dmitry Smirnov
Luke Cousins
Jon Burgess
Andrew Bauer
tikismoke
Isaac Connor
SteveGilvarry
Robin Daermann