ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,030 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

131 Commits

Author SHA1 Message Date
Isaac Connor 872adc1c62 Merge pull request #1578 from erelson/patch-2 
Minor API doc error fixes
 2016-08-15 10:02:57 -04:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
Eric Relson b822deeb8c Minor API doc error fixes 2016-08-02 10:08:08 -07:00
Steve Gilvarry 24aeb91ef2 Merge pull request #1558 from onlyjob/spellcheck 
spellcheck/codespell
 2016-07-30 00:35:10 +10:00
Pliable Pixels dc916bba2c case typo 2016-07-23 08:04:46 -04:00
Pliable Pixels 45a62dc8d8 Added example of configs API edit 2016-07-23 08:03:15 -04:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10: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
arjunrc e0c5b2a78f added consoleEvents API 2016-05-19 15:15:48 -04:00
arjunrc 13feb96811 added alarm apis 2016-05-19 15:06:41 -04:00
Pliable Pixels 859a55e1ef updated documentation to include runstates 2016-04-13 12:54:22 -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
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
Luke Cousins 2ede18a614 Minor improvements to documentation 2016-03-21 22:47:45 +00: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
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
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
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
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
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