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 |
|
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 |
|
Isaac Connor
|
ca07b951cb
|
Merge branch 'master' into newpointone
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-21 12:41:25 -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 |
|
arjunrc
|
c4bdb127ce
|
fixed custom style breaking rtd theme
|
2015-12-19 16:53:30 -05:00 |
|
arjunrc
|
2763c3d92e
|
deleted
|
2015-12-19 13:40:21 -05:00 |
|
arjunrc
|
3fe64f8ce6
|
rtd theme
|
2015-12-19 13:38:54 -05:00 |
|
SteveGilvarry
|
b78deb192b
|
Add some documentation on Multi-Server
|
2015-12-19 20:51:19 +11: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 |
|
arjunrc
|
9e2b1ba3cb
|
remove hardcoded version
|
2015-12-18 15:08:40 -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
|
e4b0e74f69
|
merge master
|
2015-09-24 10:01:27 -04:00 |
Andrew Bauer
|
f13dddb719
|
Update api.rst
|
2015-09-22 09:26:09 -05:00 |
|
Pliable Pixels
|
08e04afcd2
|
fixed security instructions with curl
|
2015-09-22 07:39:27 -04: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
|
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 |
|
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 |