X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=a6973466d3d4987e80858fa6fde52f15479c206b;hb=e408d7e895e784271a55c3a200666034db0af80a;hp=80a8c9c421861dc86c65a5af47e63fd0b430b0f1;hpb=7e48c04089a98ddce02f85815985ec0262abb20c;p=github%2Fwallabag%2Fwallabag.git diff --git a/README.md b/README.md index 80a8c9c4..a6973466 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,15 +8,18 @@ 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/). Then you can install wallabag by executing the following commands: +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). +Then you can install wallabag by executing the following commands: ``` -SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag 2.0.*alpha --no-dev -php bin/console wallabag:install -php bin/console server:run + git clone https://github.com/wallabag/wallabag.git + cd wallabag + git checkout 2.0.6 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + php bin/console wallabag:install --env=prod + php bin/console server:run --env=prod ``` ## License