X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=ca61f029afaa295fb952d49e28455c9487585ea0;hb=2ff9991a1dfac0d3463662b96f529aac70c66f76;hp=e175b6c32bf21c09ab0b144a61d74cf05047dadc;hpb=c118131317742a4b77031af89d19eba3b5eabd24;p=github%2Fwallabag%2Fwallabag.git diff --git a/README.md b/README.md index e175b6c3..ca61f029 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![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) +[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master) [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag) # What is wallabag? @@ -8,18 +8,16 @@ Click, save and read it when you can. It extracts content so that you can read i More informations on our website: [wallabag.org](https://wallabag.org) -# Want to test the v2? -Keep in mind it's an **unstable** branch, everything can be broken :) +# Install wallabag -If you don't have it yet, please [install composer](https://getcomposer.org/download/). +If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation. Then you can install wallabag by executing the following commands: ``` 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 + git checkout 2.1.0 + ./install.sh php bin/console server:run --env=prod ```