2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
f5f7363d35
add RTSPDescribe column to Monitors table
2015-08-21 10:32:04 -05:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
22275e661c
Tell cake to use the same session id as classic ui
2015-08-21 09:03:44 -04:00
3269cf0cec
Merge pull request #1027 from tikismoke/patch-1
...
Typo in README.md
2015-08-21 06:39:43 -05:00
52d3fdf471
Update README.md
...
little correction
2015-08-21 11:29:35 +02:00
3ff9c38a2e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-20 20:36:21 -04:00
8e01dad828
add the api tmp link
2015-08-20 20:36:09 -04:00
5ce35f147a
initial rough version
2015-08-20 20:35:01 -04:00
6a1bbd2055
remove systemd overrides
2015-08-20 13:49:04 -04:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
fbcd6f365b
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
2015-08-20 16:17:08 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
96a710671d
add the api tmp dir link to /tmp/zm
2015-08-19 16:23:36 -04:00
daba109e7d
set AllowOverride All for api dir
2015-08-19 16:09:03 -04:00
492cafe08e
set AllowOverride All for api dir
2015-08-19 16:08:48 -04:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
3f5370b8c7
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-08-19 13:58:44 -04:00
e4f1795fa4
1404 doesn't have 3.9.6, so go back to 3.9.4
2015-08-19 13:35:06 -04:00
93e948e0d8
these links need to move under www to work
2015-08-19 13:31:56 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
ecf9ea2f34
Merge branch 'manupap1-add_analysis_interval'
2015-08-18 20:21:47 -05:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
d51a155be6
Merge pull request #966 from SteveGilvarry/Changelog_Update
...
Auto generated changelog
2015-08-18 17:18:19 -05:00
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
33674d8a9b
Merge branch 'schrorg-large-timestamp'
2015-08-18 14:09:01 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
c78f39c106
Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images
...
959 add exif date time to images
2015-08-18 13:46:54 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
b974e77b45
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-18 14:32:22 -04:00
4767a6fb38
remove systemd, and extra Standards-Version
2015-08-18 14:01:56 -04:00
7f305c9f73
Merge pull request #1021 from knnniggett/log_logins
...
Send login activity to the zoneminder event log
2015-08-18 12:01:08 -04:00
16897b7c94
rough in ubuntu1204 version of cmake build
2015-08-18 11:57:56 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3b9bb6053c
Add clarifying comment
2015-08-17 22:10:39 -04:00
9351e1b9d9
Incorporate exif switch
2015-08-17 22:07:41 -04:00
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
a63c0a26b8
content update
2015-08-17 16:21:24 -04:00
2ca3ca8d50
added missing zone images
2015-08-17 15:42:49 -04:00
c6e2914228
Added system diagram
2015-08-17 15:30:00 -04:00
3b3ae0adf5
This will be used from now on when generating master snapshots for ubuntu1504 for a single zoneminder.deb
...
It was taken from the debian official package on August 17th 2015. Various unneeded patches were removed
and the dependencies were change to use the ffmpeg version of av libraries. Also, since ubuntu1504 does not have cakephp 2 available
we cannot use a packaged version of that, so we still need our own copy for the api
2015-08-17 14:03:27 -04:00
75bdc0d2e1
Delete connect
...
deleted rouge file.
2015-08-17 12:33:16 -05:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
1d8a4ebdd8
Merge branch 'master' into multi-server
2015-08-17 12:33:43 -04:00
Andrew Bauer
Isaac Connor
Andrew Bauer
tikismoke
Robin Daermann
Linwood-F
Isaac Connor
Isaac Connor
Pliable Pixels