Commit Graph

71 Commits

Author SHA1 Message Date
Andrew Bauer d53f3e8048
Update README.md 2018-01-14 15:21:40 -06:00
MalakymR de6f8de3f8 Include Gentoo ebuild (#1993)
package: https://packages.gentoo.org/packages/www-misc/zoneminder
wiki: https://wiki.gentoo.org/wiki/ZoneMinder

Currently at 1.30.2, PR pending for .4
Will be a -9999 ebuild to track git soon as well.
2017-10-04 07:41:44 -04:00
DeathByKorea 6cbab6e68b Added Arch AUR package (#1986)
Package is well maintained, [Arch Wiki page](https://wiki.archlinux.org/index.php/ZoneMinder)
2017-09-23 13:46:40 -04:00
Andrew Bauer a64810fcfc Update README.md 2017-08-10 20:34:48 -05:00
Andrew Bauer fd7ea84e81 Update README.md
Point users to rpmfusion for zoneminder rpm releases
2017-08-10 20:34:05 -05:00
SteveGilvarry 55df858ded Revert h264 README.md changes again....................... 2017-05-23 20:25:36 +10:00
Dav Glass 0df3248fb6 added RecordAudio to sql in README 2017-01-01 08:12:42 -06:00
Isaac Connor a7979eb63b Merge branch 'master' into feature-h264-videostorage 2016-10-03 13:21:50 -04:00
Kyle Johnson 4b6b28983e Correct spelling of 'Mageia' in readme 2016-08-30 09:47:08 -06:00
Isaac Connor 5a0218778c put back some text 2016-04-06 10:50:33 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Andrew Bauer 2deeb6bebf Merge pull request #1339 from mnoorenberghe/readme-rtd
Change README documentation link to readthedocs
2016-03-23 16:46:43 -05:00
Steve Gilvarry 0d0bb9a9c3 Update README.md 2016-03-23 21:58:50 +11:00
Matt N 0af83ed7f3 Change README documentation link to readthedocs
The wiki just ends up linking there
2016-03-13 15:19:04 -07:00
Andy Bauer 72c8ae3735 Remove package building instructions from README.md 2016-02-28 12:32:45 -06:00
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Steve Gilvarry 57c0662ad0 Update README.md 2015-11-04 17:13:05 +11:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Andrew Bauer 1dbea023b8 Update README.md
remove draft note
2015-10-03 15:33:04 -05:00
Andrew Bauer 7af5652e55 Update README.md
spelling
2015-09-21 06:45:27 -05:00
Andrew Bauer e10bcc55a7 Update README.md
spelling
2015-08-13 08:40:16 -05:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Andrew Bauer a206d46248 Update README.md 2015-07-24 14:01:25 -05:00
SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
Andrew Bauer f638b077fc Update README.md 2015-05-18 16:58:11 -05:00
Andrew Bauer ea7c1f6883 Update README.md 2015-05-17 16:34:08 -05:00
Andrew Bauer b65d08b445 Update README.md
typo
2015-05-17 16:21:22 -05:00
Andrew Bauer 9bd4fa6c8a Update README.md 2015-05-17 16:20:37 -05:00
Andrew Bauer 466c6d9dd8 Update README.md 2015-05-17 15:35:49 -05:00
Andrew Bauer 8545f30d72 Update README.md
typo
2015-05-17 15:30:07 -05:00
Andrew Bauer 9d4916ad49 Update README.md 2015-05-17 15:27:46 -05:00
Andrew Bauer 3c5e05d1f4 Update README.md 2015-05-17 15:24:35 -05:00
Andrew Bauer 04f698824f Update README.md 2015-05-17 15:23:14 -05:00
Andrew Bauer 134b6b1dbb Update README.md 2015-05-17 15:22:02 -05:00
Andrew Bauer d8cd6abc06 Update README.md
One of may commits to update build instructions for Redhat based distros
2015-05-17 15:00:39 -05:00
Andrew Bauer a03f3f39b5 Update README.md
Better http link formatting
2015-05-14 10:06:16 -05:00
Andrew Bauer a1ca1a8af5 Update README.md 2015-05-14 10:02:35 -05:00
Andrew Bauer 691fbbb0a6 Update README.md 2015-05-14 09:06:42 -05:00
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