Isaac Connor
|
063fa7b6fe
|
put back these nice files from master
|
2017-03-20 13:45:22 -04:00 |
Isaac Connor
|
208337635a
|
Merge branch 'master' into storageareas
|
2016-08-01 19:30:01 -04:00 |
Dmitry Smirnov
|
f1acc52913
|
spellcheck/codespell
|
2016-07-14 00:30:39 +10:00 |
|
Isaac Connor
|
a30610fbda
|
Merge branch 'master' into storageareas
|
2016-07-12 10:31:10 -04:00 |
|
Isaac Connor
|
7ff7684da6
|
add back deban install docs
|
2016-07-12 10:31:05 -04:00 |
Steve Gilvarry
|
5811ba7eda
|
Swap to apt-get for debian
|
2016-07-05 23:10:03 +10:00 |
|
Steve Gilvarry
|
3a40f39d83
|
Fix 14.04 php.ini location and some more formatting issues
|
2016-07-05 07:52:37 +10:00 |
|
Steve Gilvarry
|
219289ee20
|
Consistency changes
|
2016-07-05 07:15:01 +10:00 |
|
Steve Gilvarry
|
b2d1d688cc
|
Updates to Ubuntu and Debian install guides
|
2016-07-03 20:21:13 +10:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
Andrew Bauer
|
d412e8dc5c
|
Update redhat.rst
|
2016-03-25 07:54:37 -05:00 |
Luke Cousins
|
0e54831072
|
Swapping back to vi as default editor
|
2016-03-24 15:15:58 +00:00 |
|
Isaac Connor
|
a66e97de09
|
Merge & fix new console & options
|
2016-03-23 09:48:57 -04:00 |
|
Luke Cousins
|
2ede18a614
|
Minor improvements to documentation
|
2016-03-21 22:47:45 +00:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Jon Burgess
|
b11f3bce53
|
Assume this was meant to be Asterisk, not Astericks.
|
2016-03-19 15:25:17 +00:00 |
|
Andrew Bauer
|
fe46785e94
|
Update redhat.rst
|
2016-03-15 07:33:40 -05:00 |
|
Andrew Bauer
|
68a5e78efc
|
Update redhat.rst
|
2016-03-15 07:30:31 -05:00 |
|
Andrew Bauer
|
dcdb879637
|
Update redhat.rst
|
2016-03-15 07:24:15 -05:00 |
|
Andrew Bauer
|
4581379d45
|
Update redhat.rst
minor edits
|
2016-03-15 07:21:34 -05:00 |
|
Andy Bauer
|
b7259b973a
|
first formatting pass
|
2016-02-28 12:54:21 -06:00 |
|
Andy Bauer
|
35d013136f
|
add redhat instructions to readthe docs
|
2016-02-28 12:27:04 -06:00 |
|
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
Andrew Bauer
|
2fc1fc4380
|
use debian control file to auto-install deps
|
2016-02-22 09:18:46 -06:00 |
|
Andrew Bauer
|
918407bcae
|
Merge pull request #1248 from pliablepixels/documentation
updated documentation for ubuntu
|
2016-02-22 09:05:53 -06:00 |
|
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 |
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 |
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 |