Commit Graph

27 Commits

Author SHA1 Message Date
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Andrew Bauer 6de2ab504c Explain ZM_SERVER_HOST in multiserver documentation 2016-02-03 12:40:30 -06:00
Isaac Connor e840eec2a4 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
	docs/installationguide/index.rst
2016-01-02 14:43:04 -05:00
Isaac Connor bf2195828f Merge branch 'multi-server' into storageareas
Conflicts:
	docs/installationguide/index.rst
2016-01-02 14:42:47 -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 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 3dc4467dc0 restore missing docs 2015-12-31 15:35:50 +11:00
Isaac Connor ca07b951cb Merge branch 'master' into newpointone
Conflicts:
	docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05: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
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage
Conflicts:
	src/zm_monitor.h
2015-12-14 16:55:26 -05:00
Isaac Connor 0184d25016 restore missing docs 2015-08-27 11:08:42 -04:00
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
Pliable Pixels 3ef7250d3e Aligned ubuntu install with iconnors post about changes in the forum 2015-08-23 13:20:04 -04:00
Isaac Connor 41637278c9 merge master 2015-08-19 16:08:12 -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
PliablePixels 71e19f48e8 Content update 2015-08-16 05:34:00 -04:00
PliablePixels 71b82ac84a ZM Developer notes for review in red 2015-08-14 20:28:03 -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
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 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