1844a7eb29
Update definemonitor.rst ( #2299 )
2018-11-09 07:59:06 -05:00
ace1134df1
further reading
2018-11-01 14:40:31 -04:00
86a086c216
server json api typo
2018-11-01 14:13:22 -04:00
14c30eac76
typo
2018-11-01 14:08:09 -04:00
536d9226e0
ptz - clarify this is meta-data
2018-11-01 14:07:53 -04:00
46cd2fc3ff
relocate monitor_status to the right place
2018-11-01 14:04:51 -04:00
cd8d609e84
initial multi-server/storage changes
2018-11-01 14:00:09 -04:00
2953ff4db4
header level fix
2018-11-01 13:40:07 -04:00
37b2da59ce
added streaming interface docs
2018-11-01 13:30:08 -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
0d1f8aaf03
Document /api/monitors/daemonStatus/
2018-10-28 17:15:39 -07:00
fc4a84011b
added note on auth hash logins ( #2237 )
...
* added note on auth hash logins
* code inline escape fix
2018-10-06 15:38:30 -04:00
246f3755a2
Update docs regarding ppa for 1.32 and 1.32 not needing mysql config changes
2018-10-02 15:19:19 -04:00
18c2ec6e17
Misspelling and grammar ( #2202 )
...
* Misspelling and grammar
* Misspelling something
2018-09-20 12:14:57 -04:00
0e2fdf4a1c
fixed path for login/logout api
2018-09-14 11:48:22 -04:00
b778fd782c
Misspelling - non-recordable ( #2200 )
2018-09-09 09:39:30 -04:00
d45ca8880a
documentation for new login/logout APIs ( #2163 )
2018-07-17 13:24:47 -04:00
073dd34d65
fixed typo
2018-05-10 20:59:08 -07:00
5ebfae5f14
fix warnings in building docs by using anonymous links (double underscore at the end)
2018-04-30 09:51:26 -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
93263c40b4
Remove mention of el6 from readthedocs
2018-04-22 07:30:28 -05:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
0d9f5b73c8
Update dedicateddrive.rst
2018-03-06 20:18:48 -06:00
b981c058d3
Update dedicateddrive.rst
2018-03-06 20:14:28 -06:00
a380f1f1a4
fix typo in url
2018-03-06 20:11:57 -06:00
2a589b5111
Update index.rst
2018-03-06 20:05:51 -06:00
7e345db0aa
add dedicated drive to readthedocs
2018-03-06 20:04:12 -06:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
3dc157732a
Issue 1963: Remove spaces from example api calls.
2018-03-03 00:58:35 -05:00
0077f2e17b
Update faq.rst
...
I see no reason to mention bits. No one cares about bits. Our base unit should be bytes. Also, lets be consistent and use 1024 as the divisor when converting to Kb and Mb and Gb.
2018-02-28 11:06:28 -05:00
7fed5fd596
spelling
2018-02-27 19:46:44 -06:00
35c63ac0bc
Update packpack.rst
2018-02-27 17:43:36 -06:00
5ac003d448
Update packpack.rst
2018-02-27 17:39:58 -06:00
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
11660b42d4
fix zoneminder github url
2018-02-20 18:40:50 -06:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
9a8a72ba27
typo
2018-01-20 17:46:53 -06:00
06c2c18135
fix url to display properly
2018-01-20 17:46:15 -06:00
8dc6910bbd
Remove reference to zm 1.29, update description of isaac's ppa
2018-01-20 17:34:37 -06:00
9df7349e8e
Update packpack.rst
...
added path to git clone command. (I'm following install guide for first time and that step didn't work without the path)
2018-01-17 19:57:45 -06:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
d83b9ce622
Fixes #1983 ( #1989 )
...
Fair point here we put a command it should run, but I have added assistance with this part of the install is not zoneminder specific
2017-09-28 18:03:39 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
431ec3ea75
Update faq.rst ( #1970 )
...
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
dc1aa2b670
Update redhat.rst
2017-08-19 21:41:19 -05:00
7d0531ccdd
Update packpack.rst
2017-08-19 21:37:04 -05:00
e749866101
Update packpack.rst
2017-08-19 21:17:06 -05:00
54f780e2d3
Update redhat.rst
2017-08-19 13:15:11 -05:00
4ccca556e1
Update packpack.rst
2017-08-19 12:52:21 -05:00
52accd7ff5
Update packpack.rst
2017-08-19 12:50:07 -05:00
9172a1bc42
Update packpack.rst
2017-08-19 12:48:57 -05:00
e473806fff
Update packpack.rst
2017-08-19 12:47:41 -05:00
8bf395465f
Update packpack.rst
2017-08-19 12:46:38 -05:00
65f03ce613
Update packpack.rst
2017-08-19 12:46:00 -05:00
7ed53f766e
Update packpack.rst
2017-08-19 12:45:39 -05:00
7a1208daaa
Update packpack.rst
2017-08-19 12:43:28 -05:00
4adad745d0
Update packpack.rst
...
fix bullets
2017-08-19 12:42:44 -05:00
dafe125ed5
initial commit to add packpack build instructions
2017-08-19 12:39:54 -05:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
edd66dd0cf
Update redhat.rst
2017-08-11 12:41:12 -05:00
0936dc79bc
Update redhat.rst
2017-08-11 12:37:44 -05:00
4aa15702e7
Update redhat.rst
2017-08-11 12:33:39 -05:00
3a7ad58c25
Update redhat.rst
2017-08-11 08:55:57 -05:00
4187da2d5a
Update redhat.rst
2017-08-11 08:45:34 -05:00
ae8873c2cc
Update redhat.rst
2017-08-11 08:44:02 -05:00
565612b86b
Update redhat.rst
2017-08-11 07:55:29 -05:00
64cf80ccf4
Update redhat.rst
2017-08-11 07:52:25 -05:00
4941e6715c
Update redhat.rst
2017-08-11 07:49:59 -05:00
27796ab720
Update redhat.rst
2017-08-10 20:57:26 -05:00
0a5188d79f
Update redhat.rst
2017-08-10 20:55:22 -05:00
148d7066f9
Merge branch 'master' into storageareas
2017-07-11 16:15:02 -04:00
0faeef58c0
Update filterevents.rst ( #1944 )
...
State where filters are actually saved
2017-07-10 17:16:01 -04:00
c926f733ea
There should be a blank line here
2017-06-28 16:13:33 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
6cc6055bd3
Fix spelling mistake in link
2017-06-17 21:50:41 -04:00
b45da97416
need a blank line
2017-06-05 13:11:09 -04:00
9a317725c0
remove extra space
2017-06-05 13:10:16 -04:00
ed6a2f3636
Merge pull request #1755 from connortechnology/update_do_debian_release
...
Update do debian release
2017-05-10 09:06:17 -04:00
de24ba7120
Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
...
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
a5f71a917e
Merge branch 'master' into update_do_debian_release
2017-05-10 08:59:09 -04:00
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
3870ca1ec0
Update redhat.rst
...
typo
2017-04-26 09:48:15 -05:00
b2fc959a50
Merge branch 'master' into update_do_debian_release
2017-04-24 17:01:56 -04:00
3dff8a5da5
update doc references to do_debian_package.sh
2017-04-24 17:01:24 -04:00
6779bd74b0
Update multiserver.rst
...
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
2017-04-21 10:44:37 -07:00
0728b935c0
Update ubuntu.rst
...
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
2017-04-21 10:43:16 -07:00
48e2c5f6ec
Update redhat.rst
2017-04-14 12:40:32 -05:00
8555b07f95
Update redhat.rst
...
update rpm building instructions to reflect latest changes
2017-04-01 08:26:27 -05:00
a40de3b588
Update redhat.rst
...
better way to create a tarball from a local git repo
2017-04-01 08:20:34 -05:00
ca303da030
added documentation for feature that allows %tags% to passed as command line args to the exec command in addtion to the event path
2017-02-15 09:38:19 -05:00
e680941568
add motion zone preset disclaimer
2017-02-10 08:30:13 -06:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
0f3642adf4
added uncompressed xml
2017-01-15 21:40:25 -05:00
d5d9a3a8e9
reminder message for website used to draw XML source images
2017-01-15 17:35:34 -05:00
9bf83a409b
fixed image type
2017-01-15 17:35:12 -05:00
b063d8d6aa
Merge pull request #1728 from connortechnology/path_zms_message
...
Path zms message
2017-01-02 08:54:32 -06:00
da1d801935
Merge branch 'path_zms_message' of github.com:ConnorTechnology/ZoneMinder into path_zms_message
2017-01-02 09:32:43 -05:00
02dac96cd9
more rst formatting changes
...
make the note about using ffmpeg over remote->rtsp in bold
2016-12-20 11:33:14 -06:00
454894e3e8
fix rst formatting
...
It is amazing how seemingly small changes in whitespace significantly affect the formatting
2016-12-20 11:30:19 -06:00
a20da2aa71
modify ffmpeg documentation, add a note to libvlc source type
2016-12-20 08:47:02 -06:00
c25dd50a21
add Remote Protocol and Remote Method to the documentation
2016-12-20 08:30:21 -06:00
09937e87f7
mention 32 bit color depth and make it preferred
2016-12-20 08:16:10 -06:00
38c31be720
typo fix pluging -> plugin
2016-12-19 22:02:44 -05:00
4e89298183
fix another typo and stop recommending that people use ZM_OPT_FAST_DELETE
2016-12-19 22:01:45 -05:00
8b726996f7
FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant.
2016-12-19 21:36:39 -05:00
ae1abe99ab
Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details
...
Add additional details to increasing mapped memory.
2016-11-04 11:24:15 -06:00
b813b51f2b
Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details"
...
This reverts commit aa74660aa4749a90f199
2016-11-04 07:15:21 -07:00
1f8e497ab9
Fix FilteredPixels Mode description
...
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
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
Aktarus
Pliable Pixels
Chris Kampmeier
Matt N
Pliable Pixels
Isaac Connor
Vitaly Saversky
Howard
Andrew Bauer
Isaac Connor
Andrew Bauer
Mike R
Brian Gallimore
Steve Gilvarry
jethornton
Andy Bauer
Joe Alamo
Martin Owens
Joshua Ruehlig
Manojav Sridhar
Kyle Johnson
Ian
Don Law
Eric Relson
Dmitry Smirnov
Luke Cousins
Jon Burgess
tikismoke
Isaac Connor
SteveGilvarry
Robin Daermann