Merge pull request #1082 from Kickball/2017-06

Merge #1080 #1079 #1074
7 years ago · 4c106f38ed
parent 30d16519da 5a2dae89a2
commit 4c106f38ed
2 changed files with 346 additions and 321 deletions
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -1,8 +1,8 @@
 Commits | Author 
 :---: | ---
- 366 | nodiscc <nodiscc@gmail.com>
- 287 | Kickball <ed.kickball@hotmail.com>
- 153 | n8225 <n8225@users.noreply.github.com>
+   394 | nodiscc <nodiscc@gmail.com>
+   290 | Kickball <ed.kickball@hotmail.com>
+   163 | n8225 <n8225@users.noreply.github.com>
   114 | Andrew Rylatt <AndyR207@users.noreply.github.com>
    35 | Kovah <mail@kovah.de>
    17 | Thomas Dalichow <info@thomasdalichow.de>
@ -60,6 +60,9 @@ Commits | Author
     3 | Garrett Martin <me@garrettqmartin.com>
     3 | George C. Privon <privong@users.noreply.github.com>
     3 | Görkem Çetin <gc@count.ly>
+     3 | Harvey Kandola <harvey@documize.com>
+     3 | IrosTheBeggar <paul.sori@gmail.com>
+     3 | Kevin Hinterlong <kevinhinterlong@users.noreply.github.com>
     3 | Lee Watson <rev@revthefox.co.uk>
     3 | Leo Gaggl <leo@brightcookie.com.au>
     3 | Marc Picaud <picaud.marc@gmail.com>
@ -74,6 +77,7 @@ Commits | Author
     3 | Tobi Schäfer <interface@p3k.org>
     3 | Yann Forget <forget.yann31@gmail.com>
     3 | Ye Lin Aung <me@yelinaung.com>
+     3 | dyu <david.yu.ftw@gmail.com>
     3 | jungle-boogie <sean@rastasean.net>
     3 | moba <moba@users.noreply.github.com>
     3 | pszlazak <pszlazak@users.noreply.github.com>
@ -106,8 +110,8 @@ Commits | Author
     2 | Jason Robinson <mail@jasonrobinson.me>
     2 | Joseph Dykstra <josephdykstra@gmail.com>
     2 | Julien Bisconti <veggiemonk@users.noreply.github.com>
+     2 | Jérémie Astori <jeremie@astori.fr>
     2 | Keith Thibodeaux <kthibodeaux@peachtreebilling.com>
- 2 | Kevin Hinterlong <kevinhinterlong@users.noreply.github.com>
     2 | Kevin Lin <developer@kevinlin.info>
     2 | Kevin Vandenborne <kevin.vandenborne@gmail.com>
     2 | Madhu GB <github@madhugb.com>
@ -120,6 +124,7 @@ Commits | Author
     2 | Nicolas Carlier <n.carlier@nunux.org>
     2 | Patrik Ragnarsson <patrik@starkast.net>
     2 | Pavel Lobashov <ShockwaveNN@gmail.com>
+     2 | Peter Demin <poslano@gmail.com>
     2 | Peter Ivanov <peter@microweber.com>
     2 | Pierre Ozoux <pierre@ozoux.net>
     2 | Pierre Tinard <Edraens@users.noreply.github.com>
@ -161,6 +166,7 @@ Commits | Author
     2 | tillarnold <throwable42@gmail.com>
     2 | tomc3 <wordoftheday003@gmail.com>
     2 | yuche <i@yuche.me>
+     2 | 王可森 <wangkesen@users.noreply.github.com>
     1 | Alashov Berkeli <yunus.alashow@gmail.com>
     1 | Alex Bogdanovski <alex@erudika.com>
     1 | Alex Fornuto <alex@fornuto.com>
@ -169,6 +175,7 @@ Commits | Author
     1 | Alys <alice.harris@oldgods.net>
     1 | Andre <andre.lehmann@posteo.de>
     1 | Andrew Murray <radarhere@gmail.com>
+     1 | Andrew Nesbitt <andrewnez@gmail.com>
     1 | Angel Velasquez <angvp@archlinux.org>
     1 | Anton Troyanov <anton@troyanov.net>
     1 | Arda Kılıçdağı <ardakilicdagi@gmail.com>
@ -188,23 +195,30 @@ Commits | Author
     1 | Chanchal Kumar Ghosh <chanchal_ghosh1987@yahoo.co.in>
     1 | Chema <neo22s@gmail.com>
     1 | Christoph Kappestein <k42b3.x@gmail.com>
+     1 | Christoph Wiechert <wio@psitrax.de>
     1 | Christophe Hamerling <christophe.hamerling@gmail.com>
+     1 | Clément AUBIN <caubin@caubin.fr>
     1 | Craig Davison <craig@davison.io>
     1 | Cristian Menghi <cristian@menghi.biz>
     1 | Damir Gainetdinov <damir.gaynetdinov@gmail.com>
     1 | Dan <rocks.in.the.cloud@gmail.com>
     1 | David Baldwynn <whitef0x0@users.noreply.github.com>
     1 | David Ng <david90@users.noreply.github.com>
+     1 | David Yu <david.yu.ftw@gmail.com>
     1 | Dirk Krause <dirkk0@googlemail.com>
     1 | Dmitriy Volkov <wldhx+vcs+github_com@wldhx.me>
     1 | Doğan Çelik <dogancelik@users.noreply.github.com>
     1 | Dražen Lučanin <kermit666@gmail.com>
+     1 | Ed Tewiah <etewiah@hotmail.com>
     1 | Edreih Aldana <edreihaldana@yahoo.com>
+     1 | Eike Kettner <eike.kettner@posteo.de>
     1 | Emeric POUPON <epoupon@users.noreply.github.com>
     1 | Eren Hatırnaz <erenhatirnaz@hotmail.com.tr>
     1 | Eric Moon <eric@ericmoon.net>
     1 | Ethan Madden <crazeh.monkeh@gmail.com>
     1 | Eugen <eugen@zeonfederated.com>
+     1 | Evelthon Prodromou <epro@prodromou.eu>
+     1 | Fazal Majid <github@sentfrom.com>
     1 | Florian Kaiser <florian.kaiser@fnkr.net>
     1 | Florian Wilhelm <f.wilhelm@tarent.de>
     1 | FortressBuilder <FortressBuilder@users.noreply.github.com>
@ -212,6 +226,7 @@ Commits | Author
     1 | Greg Chetcuti <greg@chetcuti.com>
     1 | Icantcodeatall <francois.lachese@me.com>
     1 | Igor Antun <IgorAntun@users.noreply.github.com>
+     1 | Ilya Pirozhenko <ilya.pir@gmail.com>
     1 | Izac Lorimer <izaclorimer@users.noreply.github.com>
     1 | Jakob Gillich <jakob@gillich.me>
     1 | Jan <jayphizzle@users.noreply.github.com>
@ -228,8 +243,8 @@ Commits | Author
     1 | Julien Reichardt <jul.reich43@opmbx.org>
     1 | Justin Clift <justin@postgresql.org>
     1 | Justin O'Reilly <justin@oreilly.me>
- 1 | Jérémie Astori <jeremie@astori.fr>
     1 | Ketrel <webmaster@krahs-emag.com>
+     1 | Kevin Lin <LINKIWI@users.noreply.github.com>
     1 | Keyhaku <jones@bious.fr>
     1 | Kieran <kieran.brahney@gmail.com>
     1 | Konstantin Sorokin <kvs@sigterm.ru>
@ -246,7 +261,9 @@ Commits | Author
     1 | Matteo Piccina <matteo@beiphone.it>
     1 | Michael Barrow <michael@barrow.me>
     1 | Michael Burns <michael@mirwin.net>
+     1 | Michael van Tricht <mvantricht@expandonline.nl>
     1 | Michael van Tricht <swordbeta@users.noreply.github.com>
+     1 | Mike Goodwin <xenithorb@users.noreply.github.com>
     1 | Mike Steele <mike@steel.fm>
     1 | MinorTom <TheMinorTom@users.noreply.github.com>
     1 | Moritz Kröger <write@morkro.de>
@ -263,6 +280,7 @@ Commits | Author
     1 | Peter van den Hurk <runical1991@gmail.com>
     1 | Phill <phill@formbet.co.uk>
     1 | Phonic Mouse <phonicmouse@users.noreply.github.com>
+     1 | Pierre Blanes <inattendu@users.noreply.github.com>
     1 | Rafael Milewski <Milewski@users.noreply.github.com>
     1 | Remi Rampin <remirampin@gmail.com>
     1 | Remy Adriaanse <remy@adriaanse.it>
@ -273,11 +291,13 @@ Commits | Author
     1 | Ryan Halliday <ry167@ry167.com>
     1 | Sahin Boydas <sahin@movielala.com>
     1 | Salvatore Gentile <SalGnt@users.noreply.github.com>
+     1 | Scott Humphries <sscotth@users.noreply.github.com>
     1 | Sergey Bronnikov <sergeyb@bronevichok.ru>
     1 | Spencer McIntyre <zeroSteiner@gmail.com>
     1 | Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
     1 | Stefan Weil <sw@weilnetz.de>
     1 | Sylvain Boily <sylvainboilydroid@gmail.com>
+     1 | THS-on <THS-on@users.noreply.github.com>
     1 | Tanner Collin <git@tannercollin.com>
     1 | The Scorpion <tehscorpion@users.noreply.github.com>
     1 | Thorsten Rinne <thorsten@phpmyfaq.de>
@ -287,13 +307,16 @@ Commits | Author
     1 | benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com>
     1 | bricej13 <bricej13@gmail.com>
     1 | cbdev <cb@cbcdn.com>
+     1 | cpdev <cpdevelops@users.noreply.github.com>
     1 | dimqua <dimqua@lavabit.com>
     1 | domainzero <domainzero@users.noreply.github.com>
     1 | ePirat <epirat07@gmail.com>
     1 | evitalis <evitalis@users.noreply.github.com>
     1 | florianl <florianl@users.noreply.github.com>
     1 | foorb <foorb@users.noreply.github.com>
+     1 | ghaseminya <ghaseminya@gmail.com>
     1 | ilsi <ilsi@users.noreply.github.com>
+     1 | itsnotv <itsnotv@users.noreply.github.com>
     1 | jake <jake@diesel>
     1 | lachlan-00 <lachlan.00@gmail.com>
     1 | littleguga <littleguga@users.noreply.github.com>
@ -310,6 +333,7 @@ Commits | Author
     1 | timbe16 <timbe16@users.noreply.github.com>
     1 | trebonius0 <trebonius@worldofwargraphs.com>
     1 | ttoups <ich@timotoups.de>
+     1 | uchchishta <uchchishta@users.noreply.github.com>
     1 | vincent-clipet <vincent.clipet.7@gmail.com>
     1 | wxcafé <wxcafe@wxcafe.net>
     1 | xuansamdinh <xuansamdinh.n2i@gmail.com>
--- a/README.md
+++ b/README.md
@ -306,7 +306,6 @@ _Mailing lists servers and mass mailing software - one message to many recipient
  * [Schleuder](https://schleuder.nadir.org/) - A GPG-enabled mailing list manager with resending-capabilities. ([Source Code](https://0xacab.org/schleuder/schleuder/tree/master)) `GPLv3` `Ruby`
  * [Sympa](https://www.sympa.org/) - A mailing list manager. `GPLv2` `Perl`

-
 #### Webmail clients

  * [Cypht](http://cypht.org/index.html) - A feed reader for your email accounts. ([Source Code](https://github.com/jasonmunro/hm3)) `GPLv2` `PHP`
@ -347,6 +346,7 @@ _[SIP](https://en.wikipedia.org/wiki/Session_Initiation_Protocol) telephony soft
 _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_

  * [Freepbx](http://www.freepbx.org) - Web-based open source GUI that controls and manages Asterisk. ([Source Code](http://git.freepbx.org/projects/FREEPBX)) `GPLv2` `PHP`
+  * [FusionPBX](https://www.fusionpbx.com/) - An open source project that provides a customizable and flexible web interface to the very powerful and highly scalable multi-platform voice switch called FreeSWITCH. ([Source Code](https://github.com/fusionpbx/fusionpbx)) `MPLv1.1` `PHP`
  * [Kazoo](http://2600hz.org/) - KAZOO is an open-source, highly scalable software platform designed to provide carrier-grade VoIP switch functions and features. ([Source Code](https://github.com/2600hz/KAZOO)) `MPLv1.1` `Erlang`

 ### Social Networks and Forums
@ -840,6 +840,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
  * [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`
  * [ShareLaTex](https://www.sharelatex.com/) - A web-based collaborative LaTeX editor. ([Source Code](https://github.com/sharelatex/sharelatex)) `AGPLv3` `Ruby`
+  * [Standard Notes](https://standardnotes.org) - A simple and private notes app. Protect your privacy while getting more done. That's Standard Notes. ([Demo](https://standardfile.org), [Source Code](https://github.com/standardnotes/web)) `GPLv3` `Ruby/Nodejs`
  * [to-markdown](https://domchristie.github.io/to-markdown/) - An HTML to Markdown converter written in JavaScript. ([Source Code](https://github.com/domchristie/to-markdown)) `MIT` `JavaScript`
  * [Turtl](https://turtl.it/) - A totally private personal database and note taking app. ([Source Code](https://github.com/turtl)) `GPLv3` `CommonLisp`

@ -991,7 +992,7 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection

 ### Project Management

-See also [Ticketing](#ticketing), [Task management/To-do lists](#task-managementto-do-lists)*
+_See also [Ticketing](#ticketing), [Task management/To-do lists](#task-managementto-do-lists)_

  * [Apache Bloodhound](https://bloodhound.apache.org/) - Manage software products, Keep track of features, tasks and bugs. `Apache` `Python`
  * [Bonobo Git Server](https://bonobogitserver.com/) - Set up your own self hosted git server on IIS for Windows. Manage users and have full control over your repositories with a nice user friendly graphical interface. ([Source Code](https://github.com/jakubgarfield/Bonobo-Git-Server)) `MIT` `C#`