From 133112c86fe9f757a6c1ed12ba977670728b7d4b Mon Sep 17 00:00:00 2001 From: inkhey Date: Wed, 7 Jul 2021 20:06:51 +0200 Subject: [PATCH 1/2] add tracim --- AUTHORS.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------ README.md | 1 + 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index e0c26cca..aa02c2ce 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,7 +1,7 @@ |Commits | Author | | :---: | --- | -|1494|nodiscc | -|327|n8225 | +|1560|nodiscc | +|334|n8225 | |319|Kickball | |122|Andrew Rylatt | |77|Meitar M | @@ -12,10 +12,12 @@ |23|cave beat | |17|Thomas Dalichow | |14|Miguel Piedrafita | +|14|kokomo123 <70863536+kokomo123@users.noreply.github.com>| |13|Ferdinand Mütsch | |13|jungle-boogie | |12|Alex | |12|Pe46dro | +|11|Akashdeep Dhar | |11|Pietro Marangon | |10|Kevin | |9|Andrew Peng | @@ -26,7 +28,6 @@ |8|CooperBarrett | |8|Martijn | |8|Rodrigo Avelino | -|8|kokomo123 <70863536+kokomo123@users.noreply.github.com>| |7|Hammy Havoc | |7|Ilian | |7|James Mills | @@ -37,11 +38,11 @@ |7|n1trux | |7|phre4k | |7|édouard u. | +|6|Alexander <46561566+AlexKnowsIt@users.noreply.github.com>| |6|Chris McCormick | |6|Per Guth | |6|Quinn Comendant | |6|Touhid Arastu | -|5|Alexander <46561566+AlexKnowsIt@users.noreply.github.com>| |5|Bob van Luijt | |5|Dariusz <37488679+Volmarg@users.noreply.github.com>| |5|Deluan Quintão | @@ -107,6 +108,7 @@ |4|Meitar M | |4|Praveen Durairaju | |4|Rodolfo Berrios | +|4|Ryan DeShone | |4|Sandro | |4|Sebastian Stehle | |4|Sergio Brighenti | @@ -121,6 +123,7 @@ |4|dpfaffenbauer | |4|dyu | |4|hebbet | +|4|oof2win2 | |4|paddo | |3|132ikl <132@ikl.sh>| |3|Aguay | @@ -131,6 +134,7 @@ |3|BernsteinA <4685390+BernsteinA@users.noreply.github.com>| |3|Brandon Jones | |3|Burak Emre Kabakcı | +|3|Christopher Charbonneau Wells | |3|Conor O'Callaghan | |3|Cédric Krier | |3|Daniel Mason | @@ -187,9 +191,9 @@ |3|Prashant Singh | |3|PrplHaz4 | |3|Roland Whitehead <4478022+qururoland@users.noreply.github.com>| -|3|Ryan DeShone | |3|Sandro Jäckel | |3|Sheshbabu | +|3|Sjoerd van der Hoorn | |3|Tobi Schäfer | |3|Tom Pansino <2768420+tpansino@users.noreply.github.com>| |3|Yann Forget | @@ -254,7 +258,6 @@ |2|Chris Lu | |2|Chris Missal | |2|Christophe De Troyer | -|2|Christopher Charbonneau Wells | |2|Cleberson Ramirio | |2|Corentin Brossault | |2|Costin Moise | @@ -378,7 +381,6 @@ |2|Shane Cooke | |2|Simon Vieille | |2|Simone Grignola | -|2|Sjoerd van der Hoorn | |2|Spark <24642451+Sparkenstein@users.noreply.github.com>| |2|Stefan Bohacek | |2|Stefane Fermigier | @@ -404,6 +406,7 @@ |2|Yurii Dubinka | |2|Zeniic | |2|Zeyphros | +|2|Ziga Zajc | |2|agetic | |2|ahaenggli | |2|aldevar | @@ -418,6 +421,7 @@ |2|fengshaun | |2|fuerbringer | |2|gseva | +|2|horahoradev | |2|jciskey | |2|jganobsik <39414138+jganobsik@users.noreply.github.com>| |2|jimykk | @@ -454,11 +458,13 @@ |1|Aditya Nagla | |1|Adrian Kumpf | |1|Aimee <16459597+Aimeedeer@users.noreply.github.com>| +|1|Aimeos | |1|Akos Veres | |1|Alashov Berkeli | |1|Alberto Bertogli | |1|Alejandro Rodríguez | |1|Alex | +|1|Alex Cureton-Griffiths | |1|Alex Fornuto | |1|Alex Ling | |1|Alex Tselegidis | @@ -469,6 +475,8 @@ |1|Alexey Strokach | |1|Alfred Bez | |1|Algram | +|1|Alicia Sykes | +|1|AltumCode | |1|Alys | |1|Andre | |1|Andrei Marcu | @@ -487,6 +495,7 @@ |1|Anton Troyanov | |1|Arkady Asuratov | |1|Armando Lüscher | +|1|Arnav Jindal | |1|Arnold Schrijver | |1|ArthurHoaro | |1|Ash Leece | @@ -551,13 +560,17 @@ |1|David Stephens | |1|David Yu | |1|Deeoon <25846405+Deeoon@users.noreply.github.com>| +|1|Deihim007 | |1|Denis | |1|Denis | |1|Diego Molina | |1|Dimitri Steinel | |1|Dirk Krause | +|1|Dmitrii Poddubnyi | |1|Dmitriy Volkov | |1|Dmitry Khomutov | +|1|Dmitry Sinina <12762053+dmitry-sinina@users.noreply.github.com>| +|1|Domarys | |1|DonPascualino <50177009+DonPascualino@users.noreply.github.com>| |1|Doğan Çelik | |1|Dražen Lučanin | @@ -570,6 +583,7 @@ |1|Edreih Aldana | |1|Eldad A. Fux | |1|Emeric POUPON | +|1|Emiliano | |1|Emlembow <36314674+Emlembow@users.noreply.github.com>| |1|Eran Chetz | |1|Eren Hatırnaz | @@ -586,6 +600,7 @@ |1|Fabian Patzke | |1|Farhan Ghumra | |1|Fazal Majid | +|1|Feuerhamster <38376566+Feuerhamster@users.noreply.github.com>| |1|Florian <52180080+Icesofty@users.noreply.github.com>| |1|Florian Kaiser | |1|Florian Kaldowski | @@ -596,6 +611,7 @@ |1|FreeScout <40499291+freescout-helpdesk@users.noreply.github.com>| |1|G | |1|Galen Abell | +|1|Gervwyk | |1|Gio | |1|Giorgos Logiotatidis | |1|Girish Ramakrishnan | @@ -608,8 +624,10 @@ |1|Henrique Holanda | |1|Herman Zvonimir Došilović | |1|Hooopo | +|1|Hunter Wittenborn | |1|IAlwaysBeCoding | |1|Icantcodeatall | +|1|IceCryptonym <59789660+IceCryptonym@users.noreply.github.com>| |1|Igor Antun | |1|Igor Petrov | |1|Imron RA <42175898+imronra@users.noreply.github.com>| @@ -618,6 +636,8 @@ |1|Jack | |1|Jackson Delahunt | |1|Jakob Gillich | +|1|James | +|1|James Read | |1|Jan | |1|Jan Dietrich | |1|Jannik Anker | @@ -641,6 +661,7 @@ |1|Jordan Doyle | |1|Jordan Doyle | |1|Josh Harmon | +|1|Josh Moore | |1|Joshua Hamilton | |1|José Castro | |1|Julien | @@ -672,8 +693,10 @@ |1|Lorenz Hübschle-Schneider | |1|Louis Grenard | |1|Lukas Masuch | +|1|Lukas Schulte Pelkum | |1|Luke Hoersten | |1|Luke Singham | +|1|Luke Whrit | |1|Luuk Nieuwdorp | |1|Lyz | |1|Marcin Karpezo | @@ -687,6 +710,7 @@ |1|Mark Railton | |1|Markus Dieckmann | |1|Martin Allien <1965795+AllienWorks@users.noreply.github.com>| +|1|Martin Kucej | |1|Martin Malinda | |1|Marvin | |1|Marvin Gülker | @@ -699,18 +723,22 @@ |1|Matthew Dews | |1|Matthew East | |1|Matthew McEachen | +|1|Matthew Wild | |1|Matthias De Bie | |1|Max <2843450+b-m-f@users.noreply.github.com>| |1|Max Hollmann | |1|Maxime Bouroumeau-Fuseau | +|1|Mellow Fish Ltd | |1|Michael Barrow | |1|Michael Burns | +|1|Michael Lynch | |1|Michael M. Chang | |1|Michael Malura | |1|Michael Stegeman | |1|Michael van Tricht | |1|Michael van Tricht | |1|Michael van Tricht | +|1|Miguel Michelson Martinez | |1|Mike Goodwin | |1|Mike Steele | |1|Miloš Kroulík | @@ -730,6 +758,7 @@ |1|Nicolas Mattiocco | |1|NicolasCARPi | |1|Niels Robin-Aubertin | +|1|Nikita Kolmogorov | |1|Nikodem Deja | |1|Nirmal Almara | |1|Nisar Hassan Naqvi | @@ -743,6 +772,7 @@ |1|Owen Young | |1|PMK | |1|Paolo Pustorino | +|1|Pasha Finkelshteyn | |1|Pau Kiat Wee | |1|Paul | |1|Paul Götzinger | @@ -767,9 +797,11 @@ |1|Pouria Ezzati | |1|Prahalad Belavadi | |1|Pranav Raj S | +|1|Qb | |1|Quentin de Quelen | |1|R. Miles McCain | |1|Rafael Milewski | +|1|Rafał Kukawski | |1|Raphael Fetzer | |1|RblSb | |1|Remi Rampin | @@ -782,6 +814,7 @@ |1|Roberto Rosario | |1|Robin Schneider | |1|Roman Nesterov | +|1|Ross Parker | |1|Rouven Bauer | |1|RussellAult | |1|Ryan Halliday | @@ -797,9 +830,11 @@ |1|Scott Humphries | |1|Scott Miller | |1|Sean Begley | +|1|Sebastian | |1|Senan Kelly | |1|Sergey Bronnikov | |1|Sergey Ponomarev | +|1|Sergey Romanenko | |1|Sheldon Rupp | |1|Shikiryu | |1|Shyim <6224096+shyim@users.noreply.github.com>| @@ -810,10 +845,14 @@ |1|Simon Hanna | |1|Simon Ramsay | |1|Simon Vandevelde | +|1|SlidingHorn | |1|Sourabh Joshi <38150665+sourabh-joshi@users.noreply.github.com>| |1|Spencer McIntyre | |1|Spencer Muise | +|1|Spike <19519553+spikecodes@users.noreply.github.com>| +|1|Stan Triepels <1939656+GDay@users.noreply.github.com>| |1|Starbeamrainbowlabs | +|1|Stefan Fernandez | |1|Stefan Weil | |1|Stephen Smith | |1|Steve Divskinsy | @@ -844,6 +883,7 @@ |1|Tom Tamaira | |1|Tomer Shvueli | |1|Tommy Ku | +|1|Totonyus | |1|Travis Carr | |1|Trevor Ford | |1|Uli | @@ -859,6 +899,7 @@ |1|Wonno | |1|WordsPerMinute <59267072+WordsPerMinute@users.noreply.github.com>| |1|Wundark | +|1|Yuli | |1|Yurii Rashkovskii | |1|Zoran Pandovski | |1|aeruower <65504420+aeruower@users.noreply.github.com>| @@ -868,13 +909,16 @@ |1|benmaynard11 | |1|bitcoinshirt <36959754+bitcoinshirt@users.noreply.github.com>| |1|bitsii <40513121+bitsii@users.noreply.github.com>| +|1|bram2w | |1|bricej13 | |1|buzz | |1|c22 | |1|cbdev | +|1|cinwell.li | |1|clach04 | |1|costpermille | |1|cpdev | +|1|cranberry | |1|darkdragon-001 | |1|dgtlmoon | |1|dicedtomato <35403473+diced@users.noreply.github.com>| @@ -899,7 +943,9 @@ |1|gloriafolaron <55953099+gloriafolaron@users.noreply.github.com>| |1|golangci <35628013+golangci@users.noreply.github.com>| |1|ice-92 | +|1|ifshee <85419413+ifshee@users.noreply.github.com>| |1|ilsi | +|1|inkhey | |1|itsnotv | |1|jake | |1|jarek91 | @@ -910,6 +956,7 @@ |1|kn0wmad | |1|lachlan-00 | |1|lardbit <45122868+lardbit@users.noreply.github.com>| +|1|larspontoppidan <36330737+larspontoppidan@users.noreply.github.com>| |1|lemon24 | |1|littleguga | |1|londonatil <65257173+londonatil@users.noreply.github.com>| @@ -924,11 +971,14 @@ |1|mundurragacl | |1|mxroute <37432698+mxroute@users.noreply.github.com>| |1|n2i | +|1|nicod_ | |1|niedev | |1|nodomain | |1|norstbox | |1|nwerker <45071484+nwerker@users.noreply.github.com>| +|1|orhun | |1|pastapojken | +|1|pawelmalak | |1|philipp-r || 333 | |1|phobot | |1|pips | @@ -936,6 +986,7 @@ |1|poVoq | |1|railscard | |1|raman325 <7243222+raman325@users.noreply.github.com>| +|1|ran88dom99 | |1|reddec | |1|sc0repi0 | |1|skarphet | diff --git a/README.md b/README.md index 94bbbddc..a28a745f 100644 --- a/README.md +++ b/README.md @@ -899,6 +899,7 @@ _Games, game servers and control panels._ - [SOGo](https://sogo.nu/) - SOGo offers multiple ways to access the calendaring and messaging data. CalDAV, CardDAV, GroupDAV, as well as ActiveSync, including native Outlook compatibility and Web interface. ([Demo](http://demo.sogo.nu/SOGo/), [Source Code](https://github.com/inverse-inc/sogo)) `LGPL-2.1` `Objective-C` - [SuiteCRM](http://www.suitecrm.com/) - The award-winning, enterprise-class open source CRM. ([Source Code](https://github.com/salesagility/SuiteCRM)) `AGPL-3.0` `PHP` - [Tine 2.0](https://www.tine20.org) - Contacts, Calendar, Tasks, WebDAV, ActiveSync, VOIP, Mail-Client, CRM, Sales, Projects, Timetracker. ([Demo](https://demo.tine20.net), [Source Code](https://packages.tine20.com/maintenance/source/)) `AGPL-3.0/Other` `PHP` +- [Tracim](https://github.com/tracim/tracim) - Collaborative Platform for team collaboration: file,threads,notes,agenda,etc. `AGPL + LGPL + MIT` `python` - [Zimbra Collaboration](https://www.zimbra.com/) - Email, calendar, collaboration server with Web interface and lots of integrations. ([Source Code](https://github.com/zimbra)) `GPL-2.0/CPAL-1.0` `Java` ## Human Resources Management (HRM) From 76dd2f0afcb19dcd06260efd7eb9690ff2c8b6aa Mon Sep 17 00:00:00 2001 From: inkhey Date: Thu, 8 Jul 2021 18:02:17 +0200 Subject: [PATCH 2/2] adjust tracim entry --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a28a745f..44e803af 100644 --- a/README.md +++ b/README.md @@ -899,7 +899,7 @@ _Games, game servers and control panels._ - [SOGo](https://sogo.nu/) - SOGo offers multiple ways to access the calendaring and messaging data. CalDAV, CardDAV, GroupDAV, as well as ActiveSync, including native Outlook compatibility and Web interface. ([Demo](http://demo.sogo.nu/SOGo/), [Source Code](https://github.com/inverse-inc/sogo)) `LGPL-2.1` `Objective-C` - [SuiteCRM](http://www.suitecrm.com/) - The award-winning, enterprise-class open source CRM. ([Source Code](https://github.com/salesagility/SuiteCRM)) `AGPL-3.0` `PHP` - [Tine 2.0](https://www.tine20.org) - Contacts, Calendar, Tasks, WebDAV, ActiveSync, VOIP, Mail-Client, CRM, Sales, Projects, Timetracker. ([Demo](https://demo.tine20.net), [Source Code](https://packages.tine20.com/maintenance/source/)) `AGPL-3.0/Other` `PHP` -- [Tracim](https://github.com/tracim/tracim) - Collaborative Platform for team collaboration: file,threads,notes,agenda,etc. `AGPL + LGPL + MIT` `python` +- [Tracim](https://github.com/tracim/tracim) - Collaborative Platform for team collaboration: file,threads,notes,agenda,etc. `AGPL-3.0/LGPL-3.0/MIT` `Python` - [Zimbra Collaboration](https://www.zimbra.com/) - Email, calendar, collaboration server with Web interface and lots of integrations. ([Source Code](https://github.com/zimbra)) `GPL-2.0/CPAL-1.0` `Java` ## Human Resources Management (HRM)