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

71 Commits

Author SHA1 Message Date
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
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
Isaac Connor 41637278c9 merge master 2015-08-19 16:08:12 -04: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