dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
d1343df920
Change colour of privacy zones from black to dark grey
2015-08-26 07:45:45 +02:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02: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
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
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
6bd038cb29
don't add the api to autotools, because the autotools files are not present in there
2015-08-17 12:33:00 -04:00
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
55eee8d6a4
Added SQL changes to zm_create.sql.in
...
Bumped version to 1.28.103 as requested
2015-08-17 15:05:17 +02:00
87bb60d829
Merge pull request #1019 from schrorg/dark-css-fixes
...
Small dark CSS fixes in frames and timeline view
2015-08-17 07:59:23 -05:00
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
0547a66870
Bump version to 1.28.102
2015-08-17 13:40:30 +02:00
ae9c38cfe8
bump version to 1.28.102
2015-08-16 17:57:31 -05:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
3489d0d734
add Exif column to sql database
2015-08-16 17:43:45 -05:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
a8248c3f32
Merge pull request #1018 from knnniggett/new_group_permission
...
New User Permission "Groups"
2015-08-16 16:39:39 -04:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
7d8bdd73f9
add api dir to autotools build
2015-08-16 12:23:32 -04:00
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
461f81089b
change table name from monitors to users
2015-08-15 15:42:00 -05:00
36c7d7f9c2
Add Group Edit permission to the default admin account
2015-08-15 14:58:41 -05:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
Robin Daermann
Andrew Bauer
Andrew Bauer
Linwood-F
Isaac Connor
Isaac Connor
Isaac Connor