ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,050 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5050 Commits

Author SHA1 Message Date
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
Isaac Connor 93e948e0d8 these links need to move under www to work 2015-08-19 13:31:56 -04:00
Andrew Bauer ecf9ea2f34 Merge branch 'manupap1-add_analysis_interval' 2015-08-18 20:21:47 -05:00
Andrew Bauer 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
Andrew Bauer d51a155be6 Merge pull request #966 from SteveGilvarry/Changelog_Update 
Auto generated changelog
 2015-08-18 17:18:19 -05:00
Andrew Bauer 2600b96f1b fix merge conflict in zm_monitor.cpp 2015-08-18 14:19:46 -05:00
Andrew Bauer 33674d8a9b Merge branch 'schrorg-large-timestamp' 2015-08-18 14:09:01 -05:00
Andrew Bauer 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
Andrew Bauer 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
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Isaac Connor b974e77b45 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-18 14:32:22 -04:00
Isaac Connor 4767a6fb38 remove systemd, and extra Standards-Version 2015-08-18 14:01:56 -04:00
Isaac Connor 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
Isaac Connor 16897b7c94 rough in ubuntu1204 version of cmake build 2015-08-18 11:57:56 -04:00
Linwood-F 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Linwood-F 3b9bb6053c Add clarifying comment 2015-08-17 22:10:39 -04:00