Merge pull request #1354 from wallabag/v2-clean

some cleanup
This commit is contained in:
Jeremy Benoist 2015-08-18 09:11:40 +02:00
commit 6819604185
4 changed files with 13 additions and 20 deletions

View file

@ -6,8 +6,8 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
To fix the bug quickly, we need some infos: 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 wallabag version (on top of the ./index.php file, and also on config page)
* your webserver installation : * 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 * in case of a dedicated server, the server and OS used
* the php version used, eventually `phpinfo()` * the php version used, eventually `phpinfo()`
* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL) * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
* any problem on the `wallabag_compatibility_test.php` page * 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
## You want to fix a bug or to add a feature ## 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**. 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). [Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

View file

@ -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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.

View file

@ -1,17 +1,6 @@
wallabag is based on : wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
* 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 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. Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
).
Contributors : https://github.com/wallabag/wallabag/graphs/contributors

View file

@ -16,6 +16,10 @@
"name": "Thomas Citharel", "name": "Thomas Citharel",
"homepage": "http://tcit.fr", "homepage": "http://tcit.fr",
"role": "Developer" "role": "Developer"
},
{
"name": "Jérémy Benoist",
"role": "Developer"
} }
], ],
"support": { "support": {