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

31 Commits

Author SHA1 Message Date
SteveGilvarry cc85424999 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg_camera.cpp
 2014-12-02 20:18:24 +11:00
Andrew Bauer 729d4dd9c4 Update README.md 2014-11-15 13:47:47 -06:00
Andrew Bauer ef3f06bc62 Update README.md 2014-11-15 13:39:32 -06:00
Andrew Bauer 83026fba98 Update README.md 2014-11-15 13:38:51 -06:00
Andrew Bauer a9de2416b8 Update README.md 2014-11-15 13:19:02 -06:00
Andrew Bauer 5a59a0375d Add zmeditconfigdata.s script to source 2014-11-15 10:49:53 -06:00
SteveGilvarry 4245928b35 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
	web/skins/classic/js/skin.js
 2014-10-12 20:10:36 +11:00
Andrew Bauer 12412ff5ca Merge branch 'patch-docker' of https://github.com/hamiltont/ZoneMinder into hamiltont-patch-docker 
Conflicts:
	Dockerfile
 2014-10-09 15:32:09 -05:00
stevegilvarry 17d7404c93 Merging master again 2014-06-28 22:50:28 +10:00
Kyle Johnson 5e7cdc44a8 Made the contribution section of the readme more clear 2014-06-11 09:33:15 -04:00
Kyle Johnson 0aa5591774 Changes to the Contribution section of the readme 2014-06-11 09:30:30 -04:00
Kyle Johnson 047cff8038 Added contribution and development tips to README 2014-06-10 15:43:25 -04:00
bountysource-support 007eadeb19 Add Bountysource badge to README 
Because you have some open bounties, we thought you might want to display this badge in your README!
 2014-06-04 14:42:42 -07:00
stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php
 2014-05-30 01:55:24 +10:00
Hamilton Turner f2dbb1fe08 Dockerfile works properly, documentation updated 
- Dockerfile now builds properly
- Dockerfile now ADDs files from local directory. This allows
  you to either pull from github (for master) or to build
  locally (for development)
- Removes some dependencies from container (wget, git)
- Removes pulling apache virtual host file from github
- Upgrades MySQL start check to actually check instead of just
  sleeping
 2014-04-18 12:39:05 -04:00
Hamilton Turner e5d2f6af7a Remove Subversion from prerequesite lists 2014-04-18 02:53:16 -04:00
Kyle Johnson 75d390d70a Merge branch 'release-1.27' 2014-03-15 00:51:13 -04:00
Andrew Bauer 52fd276102 Update README.md 2014-03-08 11:01:13 -06:00
Andrew Bauer 6ad6851661 Update README.md 2014-03-08 10:49:57 -06:00
Kyle Johnson 2121341f65 Added an analytics image to the readme 2014-02-11 08:16:34 -05:00
Andrew Bauer ed5ae78ed1 Update README.md 2014-02-08 09:11:24 -06:00
Bartek Zdanowski d223303d28 Update README.md 
fixed symlink problem
 2013-11-19 21:35:12 +01:00
Isaac Connor 1ac731a058 merge Debian build instructions, copy and modify for ubuntu 2013-10-09 11:02:05 -04:00
Kevin Crider f4a37bbb12 Added missing word in readme 2013-10-04 09:32:00 -04:00
Chris Wiggins d4654f63ae merge modern into feature-h264-videostorage 2013-10-04 10:52:53 +13:00
Chris Wiggins 94d291a8db Update readme again =/ 2013-09-24 15:27:54 +12:00
Chris Wiggins 3be2a2df8e Update readme 2013-09-24 15:26:42 +12:00
Kyle Johnson 87f0ba6c8e Added travis build status image to readme [ci skip] 2013-09-23 13:21:29 -04:00
Kyle Johnson fcea4660cd Minor formatting changes 2013-08-17 11:21:52 -04:00
Andy 42c9b4e7a5 Added build notes for CentOS & RHEL 2013-08-17 08:52:24 -05:00
Kyle Johnson 21ee8dbe02 Moved README to markdown language for github display 2013-08-14 12:38:42 -04:00