From 8971e4f9f611309794f323524414612c89008db2 Mon Sep 17 00:00:00 2001 From: nodiscc <nodiscc@gmail.com> Date: Fri, 9 Oct 2015 23:16:04 +0200 Subject: [PATCH] rename media streaming to video streaming, fixes https://github.com/Kickball/awesome-selfhosted/issues/293 update contributors list --- README.md | 210 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 109 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 20fe156d..389d44b2 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Table of Contents - [Groupware](#groupware) - [Learning and Courses](#learning-and-courses) - [Maps & GPS](#maps--gps) -- [Media Streaming](#media-streaming) +- [Video Streaming](#video-streaming) - [Mind Maps](#mind-maps) - [Money, Budgeting and Management](#money-budgeting-and-management) - [Monitoring and Administration](#monitoring-and-administration) @@ -88,7 +88,7 @@ _Web Analytics_ ## Automation * [Huginn](https://github.com/cantino/huginn) - Allows you to build agents that monitor and act on your behalf. Built in Ruby - `MIT` `Ruby` - + * [Http2pic](https://http2pic.haschek.at/) - website screenshots/renderer. It uses the wkhtmltox to render websites with various options. ([Source code](https://github.com/chrisiaut/http2pic)) `Apache 2.0` `PHP/Javascript` ## Blogging Platforms @@ -444,7 +444,7 @@ _Distributed filesystems_ * [Traccar](https://www.traccar.org/) - Java application to track GPS positions. Supports loads of tracking devices and protocols, has an Android and iOS App. Has a web interface to view your trips - ([Demo](http://demo.traccar.org/), [Source code](https://github.com/tananaev?tab=repositories)) - `Apache` -## Media Streaming +## Video Streaming * [Emby](https://github.com/MediaBrowser/MediaBrowser) - A home media server built using other popular open source technologies. - `GPLv2` * [Flumotion](http://flumotion.net/) - a streaming media server with intuitive graphical administration tools ([Source code](https://github.com/Flumotion/flumotion)) `LGPLv2` `Python` @@ -454,8 +454,8 @@ _Distributed filesystems_ * [Streama](https://github.com/dularion/streama) - Self-hosted Netflix alternative. - `MIT` `Java` ## Mind Maps - * [Mindmaps](https://github.com/drichard/mindmaps) - An open source, offline capable, mind mapping application ([Demo](http://drichard.org/mindmaps/)) + * [Mindmaps](https://github.com/drichard/mindmaps) - An open source, offline capable, mind mapping application ([Demo](http://drichard.org/mindmaps/)) ## Money, Budgeting and Management @@ -788,102 +788,110 @@ This list is under the [Creative Commons Attribution-ShareAlike 3.0 Unported](LI The list of contributors can be found below - 136 nodiscc <nodiscc@gmail.com> - 117 Edward D <ed.kickball@hotmail.com> + 154 nodiscc <nodiscc@gmail.com> + 120 Edward D <ed.kickball@hotmail.com> 22 Kickball <ed.kickball@hotmail.com> 13 jungle-boogie <sean@jungleboogie.me> - 9 Kovah <mail@kovah.de> - 7 Thomas Dalichow <info@thomasdalichow.de> - 7 n1trux <n1trux@users.noreply.github.com> - 7 phre4k <me@phre4k.at> - 7 édouard u. <mail@edouard.us> - 6 Per Guth <mail@perguth.de> - 6 Thomas Dalichow <2012-02-05.github.com@thomasdalichow.de> - 5 Joubert RedRat <eu+github@redrat.com.br> - 5 Moti Korets <moti.kor@gmail.com> - 4 Cory Gibbons <hello@corygibbons.com> - 4 Dominik Pfaffenbauer <dominik@lineofcode.at> - 4 Dr. Azrael Tod <github.com@g33ky.de> - 4 Jean Elchinger <jinformatique@riseup.net> - 3 Ethan Lowman <ethanal@users.noreply.github.com> - 3 Jan Vlnas <jnv@users.noreply.github.com> - 3 Leo Gaggl <leo@brightcookie.com.au> - 3 Marc Picaud <picaud.marc@gmail.com> - 3 Mariusz Kozakowski <11mariom+wordpress@gmail.com> - 3 Martin Gontovnikas <martin@gon.to> - 3 Tobi Schäfer <interface@p3k.org> - 3 Ye Lin Aung <me@yelinaung.com> - 3 jungle-boogie <sean@rastasean.net> - 3 rett gerst <rettgerst@users.noreply.github.com> - 2 Alexander Ryzhov <gtihub@ryzhov-al.ru> - 2 Alexis Metaireau <alexis@notmyidea.org> - 2 Bartłomiej Kurzeja <B3QL@users.noreply.github.com> - 2 Brendan Abolivier <contact@brendanabolivier.com> - 2 Charles Farence III <charles@charlessite90.com> - 2 Chris Missal <chris.missal@gmail.com> - 2 Costin Moise <necenzurat@gmail.com> - 2 Deryck <dhenson02@users.noreply.github.com> - 2 Greg V <greg@unrelenting.technology> - 2 Görkem Çetin <gc@count.ly> - 2 Jason Robinson <mail@jasonrobinson.me> - 2 Joseph Dykstra <josephdykstra@gmail.com> - 2 Lee Watson <rev@revthefox.co.uk> - 2 Marien Fressinaud <dev@marienfressinaud.fr> - 2 Mikael Peigney <Mika56@users.noreply.github.com> - 2 Patrik Ragnarsson <patrik@starkast.net> - 2 Peter Thaleikis <spekulatius@users.noreply.github.com> - 2 Poorchop <Poorchop@users.noreply.github.com> - 2 Roland Geider <roland@geider.net> - 2 Simon Vieille <simon@deblan.fr> - 2 Stefano <sabas88@gmail.com> - 2 Thomas Citharel <tcit@tcit.fr> - 2 cron410 <cron410@gmail.com> - 2 jimykk <JimyKK@users.noreply.github.com> - 2 tomc3 <wordoftheday003@gmail.com> - 2 yuche <i@yuche.me> - 1 Alys <alice.harris@oldgods.net> - 1 Andrew Murray <radarhere@gmail.com> - 1 Angel Velasquez <angvp@archlinux.org> - 1 Brett <brettex@hotmail.com> - 1 Caleb Xu <calebcenter@live.com> - 1 Calle Wolff <carl@wolff.se> - 1 Chema <neo22s@gmail.com> - 1 Craig Davison <craig@davison.io> - 1 Dan <rocks.in.the.cloud@gmail.com> - 1 Dirk Krause <dirkk0@googlemail.com> - 1 Dražen Lučanin <kermit666@gmail.com> - 1 Eren Hatırnaz <erenhatirnaz@hotmail.com.tr> - 1 Florian Wilhelm <f.wilhelm@tarent.de> - 1 Henry Ruhs <info@redaxmedia.com> - 1 Igor Antun <IgorAntun@users.noreply.github.com> - 1 Ilya Sevostyanov <d3th@zeen.ru> - 1 Jeremiah Marks <jeremiah@jlmarks.org> - 1 Joel Calado <joelcalado@gmail.com> - 1 Joshua Hamilton <joshua.hamilton@fabricut.com> - 1 Keith Thibodeaux <kthibodeaux@peachtreebilling.com> - 1 Kyle Stetz <kylestetz@gmail.com> - 1 Liran Tal <liran.tal@gmail.com> - 1 Marcus Ramberg <marcus@nordaaker.com> - 1 MatFluor <MatFluor@users.noreply.github.com> - 1 Mike Steele <mike@steel.fm> - 1 Morris Jobke <hey@morrisjobke.de> - 1 Murdoc Bates <trockenasche@gmail.com> - 1 Oliver Kopp <kopp.dev@gmail.com> - 1 Remy Adriaanse <remy@adriaanse.it> - 1 Remy Honig <remyhonig@users.noreply.github.com> - 1 Riddler <Iamjithin@live.com> - 1 Ryan Halliday <ry167@ry167.com> - 1 Stefan Bohacek <stefan.bohacek@gmail.com> - 1 Stefan Bohacek <stefan@fourtonfish.com> - 1 Tobias Zeising <tobias.zeising@aditu.de> - 1 benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com> - 1 bricej13 <bricej13@gmail.com> - 1 cbdev <cb@cbcdn.com> - 1 florianl <florianl@users.noreply.github.com> - 1 littleguga <littleguga@users.noreply.github.com> - 1 mertinop <martin.santibanez.a@gmail.com> - 1 sc0repi0 <sc0repi0@gmx.de> - 1 skarphet <skarphet@users.noreply.github.com> - 1 steven jacobs <stjacobs@fastmail.fm> - 1 stevesbrain <stevesbrain@users.noreply.github.com> - 1 ttoups <ich@timotoups.de> + 9 Kovah <mail@kovah.de> + 7 Thomas Dalichow <info@thomasdalichow.de> + 7 n1trux <n1trux@users.noreply.github.com> + 7 phre4k <me@phre4k.at> + 7 édouard u. <mail@edouard.us> + 6 Per Guth <mail@perguth.de> + 6 Thomas Dalichow <2012-02-05.github.com@thomasdalichow.de> + 5 Joubert RedRat <eu+github@redrat.com.br> + 5 Moti Korets <moti.kor@gmail.com> + 4 Cory Gibbons <hello@corygibbons.com> + 4 Dominik Pfaffenbauer <dominik@lineofcode.at> + 4 Dr. Azrael Tod <github.com@g33ky.de> + 4 Jean Elchinger <jinformatique@riseup.net> + 3 Ethan Lowman <ethanal@users.noreply.github.com> + 3 Jan Vlnas <jnv@users.noreply.github.com> + 3 Leo Gaggl <leo@brightcookie.com.au> + 3 Marc Picaud <picaud.marc@gmail.com> + 3 Mariusz Kozakowski <11mariom+wordpress@gmail.com> + 3 Martin Gontovnikas <martin@gon.to> + 3 Tobi Schäfer <interface@p3k.org> + 3 Ye Lin Aung <me@yelinaung.com> + 3 jungle-boogie <sean@rastasean.net> + 3 rett gerst <rettgerst@users.noreply.github.com> + 2 Albert Cervera i Areny <albert@nan-tic.com> + 2 Alexander Ryzhov <gtihub@ryzhov-al.ru> + 2 Alexis Metaireau <alexis@notmyidea.org> + 2 Bartłomiej Kurzeja <B3QL@users.noreply.github.com> + 2 Brendan Abolivier <contact@brendanabolivier.com> + 2 Charles Farence III <charles@charlessite90.com> + 2 Chris Missal <chris.missal@gmail.com> + 2 Costin Moise <necenzurat@gmail.com> + 2 David Leonard <david@appliedtrust.com> + 2 Deryck <dhenson02@users.noreply.github.com> + 2 Greg V <greg@unrelenting.technology> + 2 Görkem Çetin <gc@count.ly> + 2 Ilya Sevostyanov <d3th@zeen.ru> + 2 Jason Robinson <mail@jasonrobinson.me> + 2 Joseph Dykstra <josephdykstra@gmail.com> + 2 Lee Watson <rev@revthefox.co.uk> + 2 Marien Fressinaud <dev@marienfressinaud.fr> + 2 Massimo Santini <massimo.santini@gmail.com> + 2 Matthieu Aubry <matt@piwik.org> + 2 Mikael Peigney <Mika56@users.noreply.github.com> + 2 Patrik Ragnarsson <patrik@starkast.net> + 2 Peter Thaleikis <spekulatius@users.noreply.github.com> + 2 Poorchop <Poorchop@users.noreply.github.com> + 2 Roland Geider <roland@geider.net> + 2 Simon Vieille <simon@deblan.fr> + 2 Stefano <sabas88@gmail.com> + 2 Thomas Citharel <tcit@tcit.fr> + 2 cron410 <cron410@gmail.com> + 2 jimykk <JimyKK@users.noreply.github.com> + 2 tomc3 <wordoftheday003@gmail.com> + 2 yuche <i@yuche.me> + 1 Alys <alice.harris@oldgods.net> + 1 Andrew Murray <radarhere@gmail.com> + 1 Angel Velasquez <angvp@archlinux.org> + 1 Brett <brettex@hotmail.com> + 1 Burung Hantu <privacytoolsIO@users.noreply.github.com> + 1 Caleb Xu <calebcenter@live.com> + 1 Calle Wolff <carl@wolff.se> + 1 Chema <neo22s@gmail.com> + 1 Craig Davison <craig@davison.io> + 1 Dan <rocks.in.the.cloud@gmail.com> + 1 Dirk Krause <dirkk0@googlemail.com> + 1 Dražen Lučanin <kermit666@gmail.com> + 1 Eren Hatırnaz <erenhatirnaz@hotmail.com.tr> + 1 Florian Wilhelm <f.wilhelm@tarent.de> + 1 Henry Ruhs <info@redaxmedia.com> + 1 Igor Antun <IgorAntun@users.noreply.github.com> + 1 Jeremiah Marks <jeremiah@jlmarks.org> + 1 Joel Calado <joelcalado@gmail.com> + 1 Joshua Hamilton <joshua.hamilton@fabricut.com> + 1 Keith Thibodeaux <kthibodeaux@peachtreebilling.com> + 1 Kevin Vandenborne <kevin.vandenborne@gmail.com> + 1 Kyle Stetz <kylestetz@gmail.com> + 1 Liran Tal <liran.tal@gmail.com> + 1 Marcus Ramberg <marcus@nordaaker.com> + 1 MatFluor <MatFluor@users.noreply.github.com> + 1 Mike Steele <mike@steel.fm> + 1 Morris Jobke <hey@morrisjobke.de> + 1 Murdoc Bates <trockenasche@gmail.com> + 1 Oliver Kopp <kopp.dev@gmail.com> + 1 Remy Adriaanse <remy@adriaanse.it> + 1 Remy Honig <remyhonig@users.noreply.github.com> + 1 Riddler <Iamjithin@live.com> + 1 Ryan Halliday <ry167@ry167.com> + 1 Stefan Bohacek <stefan.bohacek@gmail.com> + 1 Stefan Bohacek <stefan@fourtonfish.com> + 1 Tobias Zeising <tobias.zeising@aditu.de> + 1 benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com> + 1 bricej13 <bricej13@gmail.com> + 1 cbdev <cb@cbcdn.com> + 1 dimqua <dimqua@lavabit.com> + 1 florianl <florianl@users.noreply.github.com> + 1 littleguga <littleguga@users.noreply.github.com> + 1 mertinop <martin.santibanez.a@gmail.com> + 1 sc0repi0 <sc0repi0@gmx.de> + 1 skarphet <skarphet@users.noreply.github.com> + 1 steven jacobs <stjacobs@fastmail.fm> + 1 stevesbrain <stevesbrain@users.noreply.github.com> + 1 ttoups <ich@timotoups.de> +