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

5390 Commits

Author SHA1 Message Date
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
Linwood-F 9351e1b9d9 Incorporate exif switch 2015-08-17 22:07:41 -04:00
Andy Bauer 64299082ad Send login activity to the zoneminder event log 2015-08-17 17:54:17 -05:00
Pliable Pixels a63c0a26b8 content update 2015-08-17 16:21:24 -04:00
Pliable Pixels 2ca3ca8d50 added missing zone images 2015-08-17 15:42:49 -04:00
Pliable Pixels c6e2914228 Added system diagram 2015-08-17 15:30:00 -04:00
Isaac Connor 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
Andrew Bauer 75bdc0d2e1 Delete connect 
deleted rouge file.
 2015-08-17 12:33:16 -05:00
Isaac Connor 3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -04:00
Isaac Connor 1d8a4ebdd8 Merge branch 'master' into multi-server 2015-08-17 12:33:43 -04:00
Isaac Connor 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
Isaac Connor 7eb07dbb65 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-17 12:30:54 -04:00
Robin Daermann 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
Andrew Bauer 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
Robin Daermann e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Robin Daermann 0547a66870 Bump version to 1.28.102 2015-08-17 13:40:30 +02:00
Andrew Bauer ae9c38cfe8 bump version to 1.28.102 2015-08-16 17:57:31 -05:00
Andrew Bauer c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00
Andrew Bauer 3489d0d734 add Exif column to sql database 2015-08-16 17:43:45 -05:00
Andrew Bauer 59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Isaac Connor a8248c3f32 Merge pull request #1018 from knnniggett/new_group_permission 
New User Permission "Groups"
 2015-08-16 16:39:39 -04:00
Pliable Pixels e6061d53b3 Clarified mysql sleep is only needed for ubuntu 14.x and below 2015-08-16 15:13:28 -04:00
Pliable Pixels 2232b6b68b Updated API to add security notes 2015-08-16 15:05:15 -04:00
Pliable Pixels 1c82f57ba3 Made content same as github README.md contributing 2015-08-16 14:49:44 -04:00
Andrew Bauer 32f6c92b02 replace php short open tag 2015-08-16 12:29:03 -05:00
Pliable Pixels 762e3eddc9 Updated mobile with correct info 2015-08-16 13:26:05 -04:00
Isaac Connor 8e491475d1 typos and whitespace fixes 2015-08-16 12:45:45 -04:00
Isaac Connor 4f07279d25 include server.php in autotools build 2015-08-16 12:25:23 -04:00
Isaac Connor 7d8bdd73f9 add api dir to autotools build 2015-08-16 12:23:32 -04:00
Isaac Connor 99d674ef78 remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user. 2015-08-16 12:22:31 -04:00
Isaac Connor b3240bbc8f set name=action on submit tag, and remove stuff that we don't want right now 2015-08-16 12:21:52 -04:00
Isaac Connor c0517b11ae Merge branch 'master' into multi-server 2015-08-16 10:52:51 -04:00
Isaac Connor 9117e2949a add server.php. 2015-08-16 10:52:47 -04:00
PliablePixels 71e19f48e8 Content update 2015-08-16 05:34:00 -04:00
Andrew Bauer 5b2155f551 define Groups permission for the default user 2015-08-15 16:47:07 -05:00
Andrew Bauer 461f81089b change table name from monitors to users 2015-08-15 15:42:00 -05:00