Andrew Bauer
|
f1eec38d98
|
Merge branch 'pliablepixels-1013-document-migration'
|
2015-08-24 09:49:39 -05: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
|
7396f84ce1
|
Merge pull request #2 from pliablepixels/1013-document-migration
formatting
|
2015-08-23 18:42:47 -04:00 |
Pliable Pixels
|
cee933225f
|
formatting
|
2015-08-23 18:41:13 -04:00 |
|
Pliable Pixels
|
fb37317e31
|
Merge pull request #1 from pliablepixels/1013-document-migration
1013 document migration
|
2015-08-23 18:13:19 -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 |
Andrew Bauer
|
f42b6f1c39
|
Merge pull request #1035 from tikismoke/patch-1
Update filterevents.rst
|
2015-08-23 10:43:32 -05:00 |
tikismoke
|
3188d67e14
|
Update filterevents.rst
more readable on RTD
|
2015-08-23 15:29:46 +02:00 |
|
Andrew Bauer
|
c49b4186e8
|
Merge pull request #1032 from tikismoke/patch-1
update doc
|
2015-08-22 12:54:47 -05:00 |
|
tikismoke
|
f9347501f9
|
update doc
make it more readable on readthedoc
|
2015-08-22 19:31:54 +02:00 |
|
Andrew Bauer
|
800d7dd33a
|
Update apache.conf.in
Keep apache.conf backwards compatible with Apache 2.2
|
2015-08-22 08:56:47 -05:00 |
|
Andrew Bauer
|
2ed442c09b
|
Merge pull request #968 from SteveGilvarry/apache_conf
Apache.conf modifications
|
2015-08-22 08:54:47 -05:00 |
Isaac Connor
|
872b9eb4b2
|
Merge pull request #1029 from knnniggett/zmlogger
Remove full path from Logger filename
I trust you
|
2015-08-21 21:44:57 -04:00 |
|
Andrew Bauer
|
14feffc455
|
strip the path from the filename
|
2015-08-21 18:28:50 -05:00 |
|
Andrew Bauer
|
22dc049bf4
|
remove Info statement used for testing
|
2015-08-21 10:34:23 -05:00 |
|
Andrew Bauer
|
9abc161995
|
bump version to 1.28.105
|
2015-08-21 10:33:42 -05:00 |
|
Andrew Bauer
|
2fbf79674b
|
Add RTSP Describe checkbox to web console
|
2015-08-21 10:32:50 -05:00 |
|
Andrew Bauer
|
f5f7363d35
|
add RTSPDescribe column to Monitors table
|
2015-08-21 10:32:04 -05:00 |
|
Andrew Bauer
|
a2d7ac86fe
|
add rtsp_describe to RtspThread class
|
2015-08-21 10:29:54 -05:00 |
Isaac Connor
|
22275e661c
|
Tell cake to use the same session id as classic ui
|
2015-08-21 09:03:44 -04:00 |
|
Andrew Bauer
|
3269cf0cec
|
Merge pull request #1027 from tikismoke/patch-1
Typo in README.md
|
2015-08-21 06:39:43 -05:00 |
|
tikismoke
|
52d3fdf471
|
Update README.md
little correction
|
2015-08-21 11:29:35 +02:00 |
|
Isaac Connor
|
3ff9c38a2e
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-08-20 20:36:21 -04:00 |
|
Isaac Connor
|
8e01dad828
|
add the api tmp link
|
2015-08-20 20:36:09 -04:00 |
|
Isaac Connor
|
5ce35f147a
|
initial rough version
|
2015-08-20 20:35:01 -04:00 |
|
Isaac Connor
|
6a1bbd2055
|
remove systemd overrides
|
2015-08-20 13:49:04 -04:00 |
Robin Daermann
|
5b465194f8
|
Renamed 'Blacken' zone type to 'Privacy'
|
2015-08-20 17:37:59 +02:00 |
|
Robin Daermann
|
acacd247c8
|
Really blacken all pixel colours
|
2015-08-20 17:17:58 +02:00 |
|
Robin Daermann
|
fbcd6f365b
|
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
|
2015-08-20 16:17:08 +02:00 |
|
Robin Daermann
|
fc50b38331
|
collect variable name
|
2015-08-20 16:02:29 +02:00 |
|
Robin Daermann
|
52be185fc9
|
Support blacken zones in all colour depths
|
2015-08-20 15:58:13 +02:00 |
|
Robin Daermann
|
b5fc6a9091
|
Make web correctly recognize new zone type
|
2015-08-20 15:09:02 +02:00 |
|
Robin Daermann
|
6fc4525784
|
Blacken Zones are now correctly displayed
|
2015-08-20 15:01:07 +02:00 |
|
Robin Daermann
|
8f9ed96585
|
First try to implement blacken areas for monitors
|
2015-08-20 14:20:41 +02:00 |
|
Isaac Connor
|
96a710671d
|
add the api tmp dir link to /tmp/zm
|
2015-08-19 16:23:36 -04:00 |
|
Isaac Connor
|
daba109e7d
|
set AllowOverride All for api dir
|
2015-08-19 16:09:03 -04:00 |
|
Isaac Connor
|
492cafe08e
|
set AllowOverride All for api dir
|
2015-08-19 16:08:48 -04:00 |
|
Isaac Connor
|
e4f1795fa4
|
1404 doesn't have 3.9.6, so go back to 3.9.4
|
2015-08-19 13:35:06 -04:00 |