198 Commits

Author	SHA1	Message	Date
tikismoke	f7bc8c7f0d	Update gettingstarted.rst ... Correct MODECT by NODECT if using zmTrigger	2016-01-26 20:14:49 +01:00
arjunrc	680ab0236c	updated ubuntu instructions	2016-01-24 07:47:25 -05:00
arjunrc	0ef6d55e8f	resolves #1231 - ubuntu package from source instructions added	2016-01-22 09:39:19 -05:00
Andy Bauer	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
Andrew Bauer	d5ec34889e	Merge pull request #1211 from SteveGilvarry/multiserver-docs ... Adding multiserver documentation	2016-01-01 09:01:31 -06:00
Andrew Bauer	fa8574c3d1	Modify network topology, consistency changes	2015-12-31 10:24:34 -06:00
SteveGilvarry	072c11fa82	Fix image border	2015-12-31 16:53:38 +11:00
SteveGilvarry	15fbf587db	Fix heading indentation	2015-12-31 16:45:22 +11:00
SteveGilvarry	251d73ffe0	Edit Toc	2015-12-31 16:40:49 +11:00
SteveGilvarry	3c2c393de6	Initial draft of Multi-server install docs	2015-12-31 16:24:56 +11:00
Isaac Connor	8dc7b3cee1	Merge branch 'master' into multi-server	2015-12-24 15:13:35 -05:00
SteveGilvarry	abda4411e9	Revert to Default Theme, RTD will use their own and local builds default sphinx theme	2015-12-23 19:34:31 +11:00
Isaac Connor	bcb18b927b	mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf	2015-12-21 13:05:56 -05:00
Isaac Connor	70cac99e17	fix claim that live view must be done on host server	2015-12-21 13:03:52 -05:00
Isaac Connor	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
arjunrc	6ccf36bc77	updated mobile app info	2015-12-20 14:55:48 -05:00
arjunrc	cbea550d70	custom theming for ZM	2015-12-19 16:53:47 -05:00
arjunrc	c4bdb127ce	fixed custom style breaking rtd theme	2015-12-19 16:53:30 -05:00
arjunrc	2763c3d92e	deleted	2015-12-19 13:40:21 -05:00
arjunrc	3fe64f8ce6	rtd theme	2015-12-19 13:38:54 -05:00
SteveGilvarry	b78deb192b	Add some documentation on Multi-Server	2015-12-19 20:51:19 +11:00
arjunrc	b444061cc6	removed -master from ppa - when 1.29 releases it will be stable	2015-12-18 15:11:05 -05:00
arjunrc	511421bff1	rewrite	2015-12-18 15:08:56 -05:00
arjunrc	9e2b1ba3cb	remove hardcoded version	2015-12-18 15:08:40 -05:00
Isaac Connor	e4b0e74f69	merge master	2015-09-24 10:01:27 -04:00
Andrew Bauer	f13dddb719	Update api.rst	2015-09-22 09:26:09 -05:00
Pliable Pixels	08e04afcd2	fixed security instructions with curl	2015-09-22 07:39:27 -04:00
Andrew Bauer	78cf7f1cf5	Merge pull request #1044 from schrorg/privacy-zone-docs ... Add Documentation for Privacy zones	2015-08-29 08:16:25 -05:00
Robin Daermann	e822265512	Add Documentation for Privacy zones	2015-08-29 10:06:56 +02:00
Pliable Pixels	d014a34b9a	added note about potential Perl and PHP time translation conflict with filters	2015-08-28 15:55:16 -04:00
Andrew Bauer	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
Pliable Pixels	cee933225f	formatting	2015-08-23 18:41:13 -04:00
Pliable Pixels	6045acc2ac	content update	2015-08-23 16:51:37 -04:00
Pliable Pixels	65c5d41f7c	content update	2015-08-23 16:41:29 -04:00
Pliable Pixels	7f23f47aea	added deprecation notice	2015-08-23 16:21:05 -04:00
Pliable Pixels	7253e837f3	content update	2015-08-23 16:15:23 -04:00
Pliable Pixels	16ff2093a1	comtent update	2015-08-23 15:58:40 -04:00
Pliable Pixels	52d5aa0c70	comtent update	2015-08-23 15:19:51 -04:00
Pliable Pixels	81d6b0f023	comtent update	2015-08-23 15:16:56 -04:00
Pliable Pixels	5716b0e1ee	merged content into camera control	2015-08-23 14:20:58 -04:00
Pliable Pixels	25e7702de7	Merged control camera and controlling monitors into one document - they both talk about PTZ	2015-08-23 14:19:54 -04:00
Pliable Pixels	e7e2c92b95	images for define monitor doc	2015-08-23 14:13:44 -04:00
Pliable Pixels	0dcf38abc3	content	2015-08-23 14:13:11 -04:00
Pliable Pixels	3ef7250d3e	Aligned ubuntu install with iconnors post about changes in the forum	2015-08-23 13:20:04 -04:00
Pliable Pixels	042e9533cf	Added an explanation of control protocols work	2015-08-23 12:22:27 -04:00
tikismoke	3188d67e14	Update filterevents.rst ... more readable on RTD	2015-08-23 15:29:46 +02:00
tikismoke	f9347501f9	update doc ... make it more readable on readthedoc	2015-08-22 19:31:54 +02:00
Pliable Pixels	a63c0a26b8	content update	2015-08-17 16:21:24 -04:00
Pliable Pixels	2ca3ca8d50	added missing zone images	2015-08-17 15:42:49 -04:00
Pliable Pixels	c6e2914228	Added system diagram	2015-08-17 15:30:00 -04:00
Pliable Pixels	e6061d53b3	Clarified mysql sleep is only needed for ubuntu 14.x and below	2015-08-16 15:13:28 -04:00
Pliable Pixels	2232b6b68b	Updated API to add security notes	2015-08-16 15:05:15 -04:00
Pliable Pixels	1c82f57ba3	Made content same as github README.md contributing	2015-08-16 14:49:44 -04:00
Pliable Pixels	762e3eddc9	Updated mobile with correct info	2015-08-16 13:26:05 -04:00
PliablePixels	71e19f48e8	Content update	2015-08-16 05:34:00 -04:00
PliablePixels	199795a67d	new content	2015-08-15 16:05:02 -04:00
PliablePixels	53d3050e78	content updates	2015-08-15 11:57:03 -04:00
PliablePixels	f77d0eda22	content updates	2015-08-15 11:56:08 -04:00
PliablePixels	58f86c03fa	For future use	2015-08-14 20:28:31 -04:00
PliablePixels	71b82ac84a	ZM Developer notes for review in red	2015-08-14 20:28:03 -04:00
PliablePixels	1ccc127d72	Template for a custom style for future use	2015-08-14 20:27:44 -04:00
PliablePixels	7e24cbebd1	Completed ubuntu package install instructions	2015-08-14 20:00:11 -04:00
PliablePixels	cd6c2a5763	Updated screenshot	2015-08-14 19:59:47 -04:00
PliablePixels	2ea8d68fa7	content updated	2015-08-14 11:53:23 -04:00
PliablePixels	69c7e0f556	content updated	2015-08-14 11:19:16 -04:00
PliablePixels	38caa4df3c	content updated	2015-08-14 10:28:28 -04:00
PliablePixels	10d8d4ea93	content updates	2015-08-14 09:29:09 -04:00
PliablePixels	ce704bf596	content update	2015-08-14 09:20:59 -04:00
PliablePixels	35580cf787	Fixed heading hierarchy of API so they all don't show in master TOC	2015-08-14 08:56:28 -04:00
PliablePixels	2b09afdcd0	FAQ is now the same as Wiki FAQ with sphinx format conversion	2015-08-14 08:55:38 -04:00
Pliable Pixels	6f3ee49d4a	Explained a caveat with using relative times	2015-08-13 15:17:48 -04:00
Pliable Pixels	71665a3315	Added updated API information ... Reflected new APIs, corrected and updated examples	2015-06-14 11:21:00 -04:00
Pliable Pixels	3ef916f49c	Update api.rst	2015-06-14 10:51:28 -04:00
Andy Bauer	77f554f7ba	bump verion to 1.28.1 in master	2015-02-18 18:24:26 -06:00
SteveGilvarry	b04d904ac3	Final fixes for Options	2014-11-22 18:51:05 +11:00
SteveGilvarry	80368684a4	Version Update and menu fix	2014-11-22 14:05:19 +11:00
SteveGilvarry	48b1aafe85	Formatting as subsections	2014-11-22 00:15:35 +11:00
SteveGilvarry	37fbc47fd9	Options Documentation First draft	2014-11-22 00:06:30 +11:00
SteveGilvarry	3bf481139b	Updating Options documentation	2014-11-18 21:46:25 +11:00
SteveGilvarry	8e7a4bb7f3	Adding screenshots for Options and Monitors	2014-11-18 16:55:36 +11:00
Steve Gilvarry	1f73155bfd	Update Ubuntu install instructions ... Removed need to install snapshot version for latest Ubuntu now that 1.28 is packaged.	2014-11-04 07:53:51 +11:00
stevegilvarry	bf1fd272df	Turning on sticky sidebar	2014-07-30 21:55:57 +10:00
SteveGilvarry	3277c6ceb8	Adding PPA Install	2014-07-16 23:36:10 +10:00
SteveGilvarry	9795967298	Initial attempt to migrate wiki to readthedocs	2014-07-13 22:25:30 +10:00
Kyle Johnson	312f378d08	Formatting and spell check on the FAQ	2014-05-02 08:31:26 -04:00
Kyle Johnson	435eac5e7e	Expanded upon the AlarmCheckMethod FAQ	2014-05-02 08:28:38 -04:00
Kyle Johnson	5fb17ecfb6	Change one of the FAQs from h1 to h2	2014-05-02 08:16:27 -04:00
Kyle Johnson	26ba50f8ac	Added an FAQ for AlarmCheckMethod	2014-05-02 08:14:57 -04:00
Kyle Johnson	cb2a9af647	Added a doc for contributing to the project	2014-04-30 13:48:03 +00:00
Kyle Johnson	ab884aa41b	Added a README to the docs dir	2014-04-30 03:30:31 +00:00
Kyle Johnson	dd854828f0	Change one of the FAQs from h1 to h2	2014-04-30 03:29:11 +00:00
Kyle Johnson	ef19d8cf18	Added another issue to the FAQ (can't see Zones)	2014-04-30 03:24:48 +00:00
Kyle Johnson	4d2f270041	Added FAQ to docs	2014-04-30 03:11:20 +00:00
Kyle Johnson	e18c4b593d	Added api doc for adding a zone	2014-04-25 19:52:08 +00:00
Kyle Johnson	0d906d4ec9	Added api doc for adding a monitor	2014-04-25 19:29:57 +00:00
Kyle Johnson	e65e17093f	Added api doc for editing configs	2014-04-25 19:19:56 +00:00
Kyle Johnson	8dd7d3e934	Initial commit of documentation for the API	2014-04-25 19:13:32 +00:00
Kyle Johnson	48304d2322	Initial commit of Sphinx docs directory	2014-04-25 18:33:41 +00:00