X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=e175b6c32bf21c09ab0b144a61d74cf05047dadc;hb=ce25b98132c873d427a3fbdf78f5e765995c480e;hp=09f48b17f600a99ba139d818dd49259d580bc085;hpb=63c35580c7d60e2278ee6fe9ba2d4440ff0308d6;p=github%2Fwallabag%2Fwallabag.git diff --git a/README.md b/README.md index 09f48b17..e175b6c3 100644 --- a/README.md +++ b/README.md @@ -1,56 +1,29 @@ -# poche -Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source. Moreover, you can migrate from Pocket & Readability. +[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2) +[![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag) -![poche](http://inthepoche.com/img/logo.png) +# What is wallabag? +wallabag is a self hostable application allowing you to not miss any content anymore. +Click, save and read it when you can. It extracts content so that you can read it when you have time. -The website of poche is [inthepoche.com](http://inthepoche.com). +More informations on our website: [wallabag.org](https://wallabag.org) -To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche). +# Want to test the v2? +Keep in mind it's an **unstable** branch, everything can be broken :) -To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog). A Google Group is also available : [poche-users](https://groups.google.com/forum/#!forum/poche-users). +If you don't have it yet, please [install composer](https://getcomposer.org/download/). +Then you can install wallabag by executing the following commands: -[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system) - -## Requirements & installation -You have to install [sqlite for php](http://www.php.net/manual/en/book.sqlite.php) on your server. - -[PHP cURL](http://www.php.net/manual/en/book.curl.php) & [tidy_parse_string](http://www.php.net/manual/en/tidy.parsestring.php) are recommended. - -Get the [latest version](https://github.com/inthepoche/poche) of poche on github. Unzip it and upload it on your server. poche must have write access on assets, cache and db directories. - -Install composer in your project : -```bash -curl -s http://getcomposer.org/installer | php -``` -Install via composer : -```bash -php composer.phar install ``` - -That's all, you can use poche ! - -## Security -You **have** to protect your db/poche.sqlite file. Modify the virtual host of your website to add this condition : -```apache - - Order allow,deny - Deny from all - + git clone https://github.com/wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + php bin/console wallabag:install --env=prod + php bin/console server:run --env=prod ``` -Nginx version: -```nginx -location ~ /(db) { - deny all; - return 404; -} -``` - -## Usage -See the documentation on our website : [inthepoche.com](http://inthepoche.com). - ## License -Copyright © 2010-2013 Nicolas Lœuillet +Copyright © 2013-2016 Nicolas Lœuillet This work is free. You can redistribute it and/or modify it under the -terms of the Do What The Fuck You Want To Public License, Version 2, -as published by Sam Hocevar. See the COPYING file for more details. \ No newline at end of file +terms of the MIT License. See the COPYING file for more details.