devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1763 from wallabag/v2-prepare-beta2

Browse Source 
Prepare files for 2.0.0-beta.2
This commit is contained in:
Jeremy Benoist 2016-03-11 13:43:57 +01:00
commit 6aed6d69a5
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -11,12 +11,16 @@ More informations on our website: [wallabag.org](https://wallabag.org)
# Want to test the v2? # Want to test the v2?
Keep in mind it's an **unstable** branch, everything can be broken :) Keep in mind it's an **unstable** branch, everything can be broken :)
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/).
Then you can install wallabag by executing the following commands:
``` ```
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev git clone https://github.com/wallabag/wallabag.git
php bin/console wallabag:install --env=prod cd wallabag
php bin/console server:run --env=prod 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
``` ```
## License ## License

2
app/config/config.yml
View File

@ -28,7 +28,7 @@ framework:
assets: ~ assets: ~
wallabag_core: wallabag_core:
version: 2.0.0-beta.1 version: 2.0.0-beta.2
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages: languages:
en: 'English' en: 'English'

5
docs/en/user/installation.rst
View File

@ -48,7 +48,10 @@ To install wallabag itself, you must run these two commands:
:: ::
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev 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 wallabag:install --env=prod
To start php's build-in server and test if everything did install correctly, you can do: To start php's build-in server and test if everything did install correctly, you can do:

5
docs/fr/user/installation.rst
View File

@ -46,7 +46,10 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
:: ::
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev 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 wallabag:install --env=prod
Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :