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