Isaac Connor
|
80a294da34
|
tabs to spaces
|
2015-08-27 11:10:13 -04:00 |
|
Isaac Connor
|
53159ed12c
|
restore changelog to keep PR clean
|
2015-08-27 11:10:05 -04:00 |
|
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 |
Isaac Connor
|
1cf54d2e38
|
Merge pull request #1026 from schrorg/blacken-zones
Add new zone type - privacy zones
|
2015-08-27 09:14:16 -04:00 |
|
Isaac Connor
|
6093587ff2
|
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
1038 fixing state mgmt 1030 is active fix
|
2015-08-27 09:08:50 -04:00 |
Robin Daermann
|
d68e8e8f68
|
Restart capture process after deleting a Privacy zone
|
2015-08-27 10:12:54 +02:00 |
|
Robin Daermann
|
dc8a3769e7
|
Make the capture process restart if a Privacy zone got changed
|
2015-08-27 09:45:12 +02:00 |
Pliable Pixels
|
b4e9a0f0cf
|
whitespacing
|
2015-08-26 12:08:10 -04:00 |
|
Pliable Pixels
|
08d177185c
|
added oninput for text field handling
|
2015-08-26 11:22:09 -04:00 |
|
Pliable Pixels
|
02a6443c3b
|
Cleaned up button handling
|
2015-08-26 11:21:29 -04:00 |
|
Pliable Pixels
|
46bd7b492b
|
adds sanity checks to isActive and default states
|
2015-08-26 11:20:58 -04:00 |
|
Pliable Pixels
|
b18ffdc13e
|
States table updated to unique Name column
|
2015-08-26 11:20:22 -04:00 |
|
Pliable Pixels
|
82fe6c8f0e
|
States table now uses a unique Name column
|
2015-08-26 11:19:58 -04:00 |
|
Robin Daermann
|
d1343df920
|
Change colour of privacy zones from black to dark grey
|
2015-08-26 07:45:45 +02:00 |
|
Robin Daermann
|
2aca87654a
|
Remove unneccessary parameter in constructor
|
2015-08-26 07:44:50 +02:00 |
|
Isaac Connor
|
c60d1cbeca
|
Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
Grey color for disabled buttons
|
2015-08-25 12:50:50 -04:00 |
|
Pliable Pixels
|
a6f296d84e
|
Grey color for disabled buttons
|
2015-08-25 12:29:40 -04:00 |
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 |
|
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 |