From 2a2903ceaae792c982288f9d13bcf5eed700b502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 17 Aug 2015 17:59:12 +0200 Subject: some cleanup --- CONTRIBUTING.md | 4 ++-- COPYING.md | 4 ++-- CREDITS.md | 19 ++++--------------- composer.json | 4 ++++ 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58bc7134..027a5a04 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new). To fix the bug quickly, we need some infos: * your wallabag version (on top of the ./index.php file, and also on config page) * your webserver installation : - * type of hosting (shared or dedicaced) + * type of hosting (shared or dedicated) * in case of a dedicaced server, the server and OS used * the php version used, eventually `phpinfo()` * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL) @@ -27,4 +27,4 @@ Note : If you have large portions of text, use [Github's Gist service](https://g ## You want to fix a bug or to add a feature Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. -[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md). \ No newline at end of file +[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md). diff --git a/COPYING.md b/COPYING.md index c43f619a..b30299fe 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2014 Nicolas Lœuillet +Copyright (c) 2013-2015 Nicolas Lœuillet Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/CREDITS.md b/CREDITS.md index e76c580d..e3916170 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,17 +1,6 @@ -wallabag is based on : -* PHP Readability https://bitbucket.org/fivefilters/php-readability -* Full Text RSS http://code.fivefilters.org/full-text-rss/src -* logo by Maylis Agniel https://github.com/wallabag/logo -* icons http://icomoon.io -* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/ -* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php -* Twig http://twig.sensiolabs.org -* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages -* Pagination https://github.com/daveismyname/pagination -* PHPePub https://github.com/Grandt/PHPePub/ +wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License. -wallabag is mainly developed by Nicolas Lœuillet under the MIT License +Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r). -Thank you so much to @tcitworld and @mariroz. - -Contributors : https://github.com/wallabag/wallabag/graphs/contributors +Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors +). diff --git a/composer.json b/composer.json index 5c093257..19db9814 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,10 @@ "name": "Thomas Citharel", "homepage": "http://tcit.fr", "role": "Developer" + }, + { + "name": "Jérémy Benoist", + "role": "Developer" } ], "support": { -- cgit v1.2.3 From f967422fae64311339a248e5b4891c55f6c989d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 18 Aug 2015 08:49:42 +0200 Subject: Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 027a5a04..ffb29f9e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ To fix the bug quickly, we need some infos: * your wallabag version (on top of the ./index.php file, and also on config page) * your webserver installation : * type of hosting (shared or dedicated) - * in case of a dedicaced server, the server and OS used + * in case of a dedicated server, the server and OS used * the php version used, eventually `phpinfo()` * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL) * any problem on the `wallabag_compatibility_test.php` page -- cgit v1.2.3