138 Commits

Author	SHA1	Message	Date
Isaac Connor	16953c6e2b	Merge branch 'storageareas' into thumbnail_on_console ... Conflicts: db/zm_update-1.29.1.sql docs/installationguide/index.rst src/Makefile.am src/zm_event.cpp src/zm_event.h src/zm_monitor.cpp src/zm_monitor.h src/zm_zone.cpp src/zmf.cpp web/skins/classic/views/console.php web/skins/classic/views/monitor.php	2016-05-02 17:41:14 -04:00
Isaac Connor	5c2ee5a1c5	Merge branch 'master' into thumbnail_on_console ... Conflicts: CMakeLists.txt configure.ac db/zm_update-1.29.1.sql distros/ubuntu1504_cmake/control docs/installationguide/index.rst scripts/Makefile.am src/Makefile.am src/zm_event.cpp src/zm_event.h src/zm_monitor.cpp src/zm_monitor.h src/zm_zone.cpp src/zmf.cpp web/includes/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/console.php web/skins/classic/views/js/console.js web/skins/classic/views/monitor.php	2016-05-02 14:36:07 -04:00
Isaac Connor	7e1a80658b	Merge branch 'master' into storageareas	2016-04-17 09:30:33 -04:00
Pliable Pixels	859a55e1ef	updated documentation to include runstates	2016-04-13 12:54:22 -04:00
Isaac Connor	60642c1fff	Merge branch 'iconnor_video' into storageareas	2016-04-05 12:32:33 -04:00
Andy Bauer	7ff8d36598	Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation	2016-04-04 20:44:53 -05: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
Isaac Connor	0d8c63f578	Merge branch 'master' into storageareas	2016-03-02 09:11:55 -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
Andrew Bauer	c138914edd	Merge pull request #1251 from tikismoke/patch-1 ... Update gettingstarted.rst	2016-02-26 07:03:36 -06:00
SteveGilvarry	d40bf89b17	Remove Phone BW settings used with mobile skin	2016-02-26 22:43:37 +11:00
SteveGilvarry	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
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	b7256a6891	Merge branch 'master' into storageareas ... Conflicts: CMakeLists.txt configure.ac db/zm_create.sql.in version	2016-02-10 09:17:40 -05:00
Dmitry Smirnov	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
Dmitry Smirnov	5bcc414038	codespell: misc. spelling corrections ... Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>	2016-02-08 20:41:36 +11: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
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
Isaac Connor	5cdf352674	don't use sphinx	2016-01-05 15:36:44 -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	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	3dc4467dc0	restore missing docs	2015-12-31 15:35:50 +11:00
Isaac Connor	98b6ef36d4	Merge branch 'multi-server' into newpointone ... Conflicts: src/zm_monitor.cpp	2015-12-28 13:13:15 -05:00
Isaac Connor	8dc7b3cee1	Merge branch 'master' into multi-server	2015-12-24 15:13:35 -05:00
Isaac Connor	fc56b14c4a	fixup sphinx theem	2015-12-23 14:06:29 -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	eccfced6d4	Merge branch 'multi-server' into newpointone ... Conflicts: distros/ubuntu1204/apache.conf	2015-12-22 09:54:13 -05:00