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 |
SteveGilvarry
|
b78deb192b
|
Add some documentation on Multi-Server
|
2015-12-19 20:51:19 +11:00 |
Andrew Bauer
|
78cf7f1cf5
|
Merge pull request #1044 from schrorg/privacy-zone-docs
Add Documentation for Privacy zones
|
2015-08-29 08:16:25 -05:00 |
Robin Daermann
|
e822265512
|
Add Documentation for Privacy zones
|
2015-08-29 10:06:56 +02:00 |
|
Pliable Pixels
|
d014a34b9a
|
added note about potential Perl and PHP time translation conflict with filters
|
2015-08-28 15:55:16 -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
|
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 |
|
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
|
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 |
Pliable Pixels
|
6f3ee49d4a
|
Explained a caveat with using relative times
|
2015-08-13 15:17:48 -04: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 |
|
SteveGilvarry
|
37fbc47fd9
|
Options Documentation First draft
|
2014-11-22 00:06:30 +11:00 |
|
SteveGilvarry
|
3bf481139b
|
Updating Options documentation
|
2014-11-18 21:46:25 +11:00 |
|
SteveGilvarry
|
8e7a4bb7f3
|
Adding screenshots for Options and Monitors
|
2014-11-18 16:55:36 +11:00 |
|
SteveGilvarry
|
9795967298
|
Initial attempt to migrate wiki to readthedocs
|
2014-07-13 22:25:30 +10:00 |