Merge 3b4014c757 into e921ece095

AUTHORS

@@ -1,204 +0,0 @@
-264 nodiscc <[email protected]>
-223 Edward D <[email protected]>
-42  Andrew <[email protected]>
-31  Kovah <[email protected]>
-22  Kickball <[email protected]>
-13  jungle-boogie <[email protected]>
-10  Thomas Dalichow <[email protected]>
-10  cave beat <[email protected]>
-9   Joubert RedRat <[email protected]>
-8   CooperBarrett <[email protected]>
-7   Andrew Peng <[email protected]>
-7   Andrew Rylatt <[email protected]>
-7   Hammy Havoc <[email protected]>
-7   Thomas Dalichow <[email protected]>
-7   n1trux <[email protected]>
-7   phre4k <[email protected]>
-7   édouard u. <[email protected]>
-6   Per Guth <[email protected]>
-5   Jean Champémont <[email protected]>
-5   Moti Korets <[email protected]>
-5   cave <[email protected]>
-4   Andrew <[email protected]>
-4   AndrewCz <[email protected]>
-4   Cory Gibbons <[email protected]>
-4   Dominik Pfaffenbauer <[email protected]>
-4   Dr. Azrael Tod <[email protected]>
-4   Ilya Sevostyanov <[email protected]>
-4   Jean Elchinger <[email protected]>
-4   Joshua Westerheide <[email protected]>
-4   Marius Voila <[email protected]>
-4   Valmik <[email protected]>
-4   dattaz <[email protected]>
-4   paddo <[email protected]>
-3   Aguay <[email protected]>
-3   Akhyar Amarullah <[email protected]>
-3   Chris McCormick <[email protected]>
-3   Conor O'Callaghan <[email protected]>
-3   Cédric Krier <[email protected]>
-3   Ethan Lowman <[email protected]>
-3   FoxMaSk <[email protected]>
-3   George C. Privon <[email protected]>
-3   Görkem Çetin <[email protected]>
-3   Jan Vlnas <[email protected]>
-3   Lee Watson <[email protected]>
-3   Leo Gaggl <[email protected]>
-3   Marc Picaud <[email protected]>
-3   Mariusz Kozakowski <[email protected]>
-3   Martin Gontovnikas <[email protected]>
-3   Mathieu Leplatre <[email protected]>
-3   Pavan Yara <[email protected]>
-3   Tobi Schäfer <[email protected]>
-3   Ye Lin Aung <[email protected]>
-3   jungle-boogie <[email protected]>
-3   rett gerst <[email protected]>
-2   Adminrezo (Nico Dewaele) <[email protected]>
-2   Albert Cervera i Areny <[email protected]>
-2   Alexander Ryzhov <[email protected]>
-2   Alexis Metaireau <[email protected]>
-2   Andrew Hayworth <[email protected]>
-2   Bartłomiej Kurzeja <[email protected]>
-2   Brendan Abolivier <[email protected]>
-2   Charles Farence III <[email protected]>
-2   Chris Missal <[email protected]>
-2   Costin Moise <[email protected]>
-2   David Leonard <[email protected]>
-2   David Wayne Baxter <[email protected]>
-2   Derek Viera <[email protected]>
-2   Deryck <[email protected]>
-2   Greg V <[email protected]>
-2   Henry Ruhs <[email protected]>
-2   Jason Robinson <[email protected]>
-2   Joseph Dykstra <[email protected]>
-2   Julien Bisconti <[email protected]>
-2   Kevin Vandenborne <[email protected]>
-2   Marien Fressinaud <[email protected]>
-2   Massimo Santini <[email protected]>
-2   Matthieu Aubry <[email protected]>
-2   Michael Tunnell <[email protected]>
-2   Mikael Peigney <[email protected]>
-2   Nicolas Carlier <[email protected]>
-2   Patrik Ragnarsson <[email protected]>
-2   Peter Ivanov <[email protected]>
-2   Peter Thaleikis <[email protected]>
-2   Pierre Ozoux <[email protected]>
-2   Poorchop <[email protected]>
-2   ReadmeCritic <[email protected]>
-2   Ricardo Torres <[email protected]>
-2   Roland Geider <[email protected]>
-2   Ryan Mulligan <[email protected]>
-2   Sam Tuke <[email protected]>
-2   Sameer Al-Sakran <[email protected]>
-2   Shane Cooke <[email protected]>
-2   Simon Vieille <[email protected]>
-2   Stefane Fermigier <[email protected]>
-2   Stefano <[email protected]>
-2   Thomas Citharel <[email protected]>
-2   Vadim Rutkovsky <[email protected]>
-2   cornerot <[email protected]>
-2   cron410 <[email protected]>
-2   jimykk <[email protected]>
-2   markkrj <[email protected]>
-2   rafael-santiago <[email protected]>
-2   thomasfrivold <[email protected]>
-2   tillarnold <[email protected]>
-2   tomc3 <[email protected]>
-2   yuche <[email protected]>
-1   Alashov Berkeli <[email protected]>
-1   Alex Fornuto <[email protected]>
-1   Alys <[email protected]>
-1   Andrew Murray <[email protected]>
-1   Angel Velasquez <[email protected]>
-1   Bob Mottram <[email protected]>
-1   Brett <[email protected]>
-1   Burung Hantu <[email protected]>
-1   C.J. Jameson <[email protected]>
-1   Caleb Xu <[email protected]>
-1   Calle Wolff <[email protected]>
-1   Chanchal Kumar Ghosh <[email protected]>
-1   Chema <[email protected]>
-1   Craig Davison <[email protected]>
-1   Dan <[email protected]>
-1   David Baldwynn <[email protected]>
-1   Dirk Krause <[email protected]>
-1   Dmitriy Volkov <[email protected]>
-1   Doğan Çelik <[email protected]>
-1   Dražen Lučanin <[email protected]>
-1   Eren Hatırnaz <[email protected]>
-1   Ethan Madden <[email protected]>
-1   Felix Bartels <[email protected]>
-1   Florian Kaiser <[email protected]>
-1   Florian Wilhelm <[email protected]>
-1   FortressBuilder <[email protected]>
-1   Gabriel Cossette <[email protected]>
-1   Igor Antun <[email protected]>
-1   Izac Lorimer <[email protected]>
-1   Jan <[email protected]>
-1   Jarek Lipski <[email protected]>
-1   Jean Menezes da Rocha <[email protected]>
-1   Jeremiah Marks <[email protected]>
-1   Joel Calado <[email protected]>
-1   Josh Harmon <[email protected]>
-1   Joshua Hamilton <[email protected]>
-1   José Castro <[email protected]>
-1   Julien Bisconti <[email protected]>
-1   Julien Reichardt <[email protected]>
-1   Justin O'Reilly <[email protected]>
-1   Jérémie Astori <[email protected]>
-1   Keith Thibodeaux <[email protected]>
-1   Keith Thibodeaux <[email protected]>
-1   Keyhaku <[email protected]>
-1   Kyle Stetz <[email protected]>
-1   Liran Tal <[email protected]>
-1   Madhu GB <[email protected]>
-1   Madhu GB <[email protected]>
-1   Marc Laporte <[email protected]>
-1   Marcin Karpezo <[email protected]>
-1   Marcus Ramberg <[email protected]>
-1   Mark Ide <[email protected]>
-1   MatFluor <[email protected]>
-1   Matt Hazinski <[email protected]>
-1   Matt Lee <[email protected]>
-1   Matteo Piccina <[email protected]>
-1   Michael Burns <[email protected]>
-1   Mike Steele <[email protected]>
-1   Morris Jobke <[email protected]>
-1   Murdoc Bates <[email protected]>
-1   NicolasCARPi <[email protected]>
-1   Norman Xu <[email protected]>
-1   Oliver Kopp <[email protected]>
-1   Paul <[email protected]>
-1   Pavel Lobashov <[email protected]>
-1   Pavel Lobashov <[email protected]>
-1   Peter van den Hurk <[email protected]>
-1   Phill <[email protected]>
-1   Pe46dro <[email protected]>
-1   Remy Adriaanse <[email protected]>
-1   Remy Honig <[email protected]>
-1   Riddler <[email protected]>
-1   Roberto Rosario <[email protected]>
-1   Ryan Halliday <[email protected]>
-1   Starbeamrainbowlabs <[email protected]>
-1   Stefan Bohacek <[email protected]>
-1   Stefan Bohacek <[email protected]>
-1   Stefan Weil <[email protected]>
-1   Sylvain Boily <[email protected]>
-1   The Scorpion <[email protected]>
-1   Tobias Zeising <[email protected]>
-1   benmaynard11 <[email protected]>
-1   bricej13 <[email protected]>
-1   cbdev <[email protected]>
-1   dimqua <[email protected]>
-1   florianl <[email protected]>
-1   hebbet <[email protected]>
-1   lachlan-00 <[email protected]>
-1   littleguga <[email protected]>
-1   memorex258 <[email protected]>
-1   mertinop <[email protected]>
-1   sc0repi0 <[email protected]>
-1   skarphet <[email protected]>
-1   steven jacobs <[email protected]>
-1   stevesbrain <[email protected]>
-1   ttoups <[email protected]>
-1   wxcafé <[email protected]>
-1   Zhouzi <[email protected]>

AUTHORS.md

@@ -0,0 +1,102 @@
+Commits | Author
+--- | ---
+195| [nodiscc](https://github.com/nodiscc)
+113| [Kickball](https://github.com/Kickball)
+83| [n8225](https://github.com/n8225)
+35| [Kovah](https://github.com/Kovah)
+17| [AndyR207](https://github.com/AndyR207)
+16| [jungle-boogie](https://github.com/jungle-boogie)
+14| [cavebeat](https://github.com/cavebeat)
+14| [m1guelpf](https://github.com/m1guelpf)
+14| [n1trux](https://github.com/n1trux)
+12| [Pe46dro](https://github.com/Pe46dro)
+9| [joubertredrat](https://github.com/joubertredrat)
+9| [TwizzyDizzy](https://github.com/TwizzyDizzy)
+8| [CooperBarrett](https://github.com/CooperBarrett)
+8| [dpfaffenbauer](https://github.com/dpfaffenbauer)
+7| [edouerd](https://github.com/edouerd)
+7| [HammyHavoc](https://github.com/HammyHavoc)
+7| [pengc99](https://github.com/pengc99)
+6| [arastu](https://github.com/arastu)
+6| [pguth](https://github.com/pguth)
+6| [rodolfoberrios](https://github.com/rodolfoberrios)
+5| [Corion](https://github.com/Corion)
+5| [faisalhmohd](https://github.com/faisalhmohd)
+5| [jchampemont](https://github.com/jchampemont)
+5| [motiko](https://github.com/motiko)
+4| [88250](https://github.com/88250)
+4| [corygibbons](https://github.com/corygibbons)
+4| [dattaz](https://github.com/dattaz)
+4| [DrAzraelTod](https://github.com/DrAzraelTod)
+4| [jdoubleu](https://github.com/jdoubleu)
+4| [jinformatique](https://github.com/jinformatique)
+4| [kohenkatz](https://github.com/kohenkatz)
+4| [mariusv](https://github.com/mariusv)
+4| [richter-p](https://github.com/richter-p)
+4| [smacz42](https://github.com/smacz42)
+4| [uggrock](https://github.com/uggrock)
+4| [vjFaLk](https://github.com/vjFaLk)
+3| [11mariom](https://github.com/11mariom)
+3| [Aguay-val](https://github.com/Aguay-val)
+3| [akhy](https://github.com/akhy)
+3| [buremba](https://github.com/buremba)
+3| [cedk](https://github.com/cedk)
+3| [chr15m](https://github.com/chr15m)
+3| [d3th](https://github.com/d3th)
+3| [ethanal](https://github.com/ethanal)
+3| [ewhal](https://github.com/ewhal)
+3| [foxmask](https://github.com/foxmask)
+3| [gorkem-cetin](https://github.com/gorkem-cetin)
+3| [jnv](https://github.com/jnv)
+3| [k0a1a](https://github.com/k0a1a)
+3| [leogaggl](https://github.com/leogaggl)
+3| [leplatrem](https://github.com/leplatrem)
+3| [marcpicaud](https://github.com/marcpicaud)
+3| [mgonto](https://github.com/mgonto)
+3| [nebulade](https://github.com/nebulade)
+3| [p3k](https://github.com/p3k)
+3| [privong](https://github.com/privong)
+3| [rettgerst](https://github.com/rettgerst)
+3| [spekulatius](https://github.com/spekulatius)
+3| [TheReverend403](https://github.com/TheReverend403)
+3| [yarapavan](https://github.com/yarapavan)
+3| [yelinaung](https://github.com/yelinaung)
+3| [Zhouzi](https://github.com/Zhouzi)
+2| [adminrezo](https://github.com/adminrezo)
+2| [almet](https://github.com/almet)
+2| [ArtskydJ](https://github.com/ArtskydJ)
+2| [B3QL](https://github.com/B3QL)
+2| [babolivier](https://github.com/babolivier)
+2| [cfarence](https://github.com/cfarence)
+2| [cron410](https://github.com/cron410)
+2| [dbxt](https://github.com/dbxt)
+2| [dentarg](https://github.com/dentarg)
+2| [dhenson02](https://github.com/dhenson02)
+2| [fourtonfish](https://github.com/fourtonfish)
+2| [jaywink](https://github.com/jaywink)
+2| [JimyKK](https://github.com/JimyKK)
+2| [marienfressinaud](https://github.com/marienfressinaud)
+2| [mattab](https://github.com/mattab)
+2| [MichaelTunnell](https://github.com/MichaelTunnell)
+2| [Mika56](https://github.com/Mika56)
+2| [myfreeweb](https://github.com/myfreeweb)
+2| [ncarlier](https://github.com/ncarlier)
+2| [necenzurat](https://github.com/necenzurat)
+2| [peter-mw](https://github.com/peter-mw)
+2| [Poorchop](https://github.com/Poorchop)
+2| [rafael-santiago](https://github.com/rafael-santiago)
+2| [ReadmeCritic](https://github.com/ReadmeCritic)
+2| [realdavidops](https://github.com/realdavidops)
+2| [redaxmedia](https://github.com/redaxmedia)
+2| [rictorres](https://github.com/rictorres)
+2| [rolandgeider](https://github.com/rolandgeider)
+2| [sabas](https://github.com/sabas)
+2| [samtuke](https://github.com/samtuke)
+2| [ShockwaveNN](https://github.com/ShockwaveNN)
+2| [simmstein](https://github.com/simmstein)
+2| [tcitworld](https://github.com/tcitworld)
+2| [tillarnold](https://github.com/tillarnold)
+2| [tomc3](https://github.com/tomc3)
+2| [veggiemonk](https://github.com/veggiemonk)
+2| [veloxy](https://github.com/veloxy)
+2| [yuche](https://github.com/yuche)

README.md

@@ -47,7 +47,7 @@ See [Contributing](.github/CONTRIBUTING.md).
   - [Games](#games)
   - [Gateways](#gateways)
   - [Groupware](#groupware)
-  - [Human Recources Management (HRM)](#human-recources-management-hrm)
+  - [Human Resources Management (HRM)](#human-resources-management-hrm)
   - [Learning and Courses](#learning-and-courses)
   - [Maps & GPS](#maps--gps)
   - [Media Streaming](#media-streaming)
@@ -436,6 +436,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi
   * [Plone](https://plone.org/) - Powerful open-source CMS system. ([Source Code](https://github.com/plone)) `Zope` `Python`
   * [ProcessWire](https://processwire.com/) - ProcessWire is an open source content management system (CMS) and web application framework aimed at the needs of designers, developers and their clients. ([Source Code](https://github.com/ryancramerdesign/ProcessWire)) `MPLv2` `PHP`
   * [Publify](http://publify.co/) - A simple but full featured web publishing software. ([Demo](http://demo.publify.co/), [Source Code](https://github.com/publify/publify)) `MIT` `Ruby`
+  * [REDAXO](http://www.redaxo.org) - A simple, flexible and useful content management system (documentation only available in German). ([Source Code](https://github.com/redaxo/redaxo)) `MIT` `PHP`
   * [Redaxscript](http:/redaxscript.com) - Ultra lightweight CMS for MySQL, SQLite and PostgreSQL. ([Demo](http://demo.redaxscript.com/demo/login), [Source Code](https://github.com/redaxmedia/redaxscript)) `GPLv3` `PHP`
   * [Roadiz](https://www.roadiz.io/) -  Modern CMS based on a node system which can handle many types of services. ([Source Code](https://github.com/roadiz/roadiz/)) `MIT` `PHP`
   * [SilverStripe](https://www.silverstripe.org) - Easy to use CMS with powerful MVC framework underlying. ([Demo](http://demo.silverstripe.org/), [Source Code](https://github.com/silverstripe)) `BSD` `PHP`
@@ -654,7 +655,7 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems
   * [Zimbra Collaboration](https://www.zimbra.com/downloads/) - Email, calendar, collaboration server with web interface and lots of integrations. ([Source Code](https://git.zimbra.com/repos/zimbra-foss/)) `GPLv2/CPALv1` `Java`
 
 
-## Human Recources Management (HRM)
+## Human Resources Management (HRM)
 
 **[`^        back to top        ^`](#)**
 
@@ -734,6 +735,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 
 **[`^        back to top        ^`](#)**
 
+  * [Anchr](https://anchr.io) - Anchr is a toolbox for tiny tasks on the internet, including bookmark collections, URL shortening and (encrypted) image uploads. ([Source Code](https://github.com/n1try/anchr)) `GPLv3` `Nodejs`
   * [COPS](https://blog.slucas.fr/en/oss/calibre-opds-php-server) - A lightweight e-book server alternative to Calibre content server or Calibre2OPDS. ([Demo](http://cops-demo.slucas.fr/index.php), [Source Code](https://github.com/seblucas/cops)) `GPLv2` `PHP`
   * [CrushPaper](https://www.crushpaper.com/) - Research the web for relevant sources, save quotations from them to CrushPaper and then combine them with your own insights into a paper. ([Source Code](https://github.com/ZapBlasterson/crushpaper)) `AGPLv3` `Java`
   * [DomainMOD](https://domainmod.org) - An application to manage your domains and other internet assets in a central location. DomainMOD includes a Data Warehouse framework that allows you to import your WHM/cPanel web server data so that you can view, export, and report on your data. ([Demo](https://demo.domainmod.org), [Source Code](https://github.com/domainmod/domainmod)) `GPLv3` `PHP`
@@ -797,6 +799,8 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
   * [notes](https://github.com/SSilence/notes) - Simple script for personal notes with a single page with a WYSIWYG Editor. `GPLv3` `PHP`
   * [OpenNote](https://github.com/FoxUSA/OpenNote) - OpenNote was built to be an open web-based alternative to Microsoft OneNote (T) and EverNote. ([Demo](https://foxusa.github.io/OpenNote/OpenNote/#/folder)) `MIT` `HTML5`
   * [Paperwork](http://paperwork.rocks) - OpenSource note-taking & archiving alternative to Evernote, Microsoft OneNote & Google Keep. ([Source Code](https://github.com/twostairs/paperwork)) `MIT` `PHP`
+  * [savepad](https://github.com/novavex/textpad) - A minimalist notepad based on notepad.cc. `MIT` `PHP`
+  * [scri.ch](https://scri.ch/) - scri.ch is a minimal web app that lets you draw, share, and fork existing drawings. ([Source Code](https://github.com/lisezmoi/scri.ch)) `MIT` `PHP`
   * [ShareLaTex](https://www.sharelatex.com/) - A web-based collaborative LaTeX editor. ([Source Code](https://github.com/sharelatex/sharelatex)) `AGPLv3` `Ruby`
   * [Turtl](https://turtl.it/) - A totally private personal database and note taking app. ([Source Code](https://github.com/turtl)) `GPLv3` `CommonLisp`
 
@@ -912,6 +916,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
 
 **[`^        back to top        ^`](#)**
 
+  * [http2-serverpush-proxy](https://github.com/n1try/http2-serverpush-proxy) - A reverse proxy that helps to automatically utilize HTTP/2.0's server push mechanism for static websites. Available as middleware and standalone application. `MIT` `Nodejs`
   * [microproxy](https://github.com/thekvs/microproxy) - lightweight non-caching HTTP/HTTPS proxy server. ([Source Code](https://github.com/thekvs/microproxy)) `MIT` `Go`
   * [miniProxy](https://github.com/joshdick/miniProxy/) - Simple web proxy written in PHP that can allow you to bypass Internet content filters, or to browse the internet anonymously. Only one php file. ([Source Code](https://github.com/joshdick/miniProxy/)) `GPLv3` `PHP`
   * [Oranjeproxy](http://lehollandaisvolant.net/tout/oranjeproxy/) - Anonymizing web proxy. ([Source Code](https://github.com/AmauryCarrade/OranjeProxy)) `GPLv2` `PHP`
@@ -1216,7 +1221,7 @@ Contributing guidelines can be found [here](.github/CONTRIBUTING.md).
 
 ## Authors
 
-The list of authors can be found [here](AUTHORS).
+The list of authors can be found [here](AUTHORS.md).
 
 ## License