mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 11:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1738 from wallabag/v2-prepare-beta1

Browse source 
Prepare wallabag for first beta 🚀
This commit is contained in:
Jeremy Benoist 2016-03-01 09:00:42 +01:00
commit 4be43814e2
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -14,7 +14,7 @@ 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:
```
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
php bin/console wallabag:install --env=prod
php bin/console server:run --env=prod
```

2
app/config/config.yml
View file

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

2
docs/en/user/installation.rst
View file

@ -48,7 +48,7 @@ To install wallabag itself, you must run these two commands:
::
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
php bin/console wallabag:install --env=prod
To start php's build-in server and test if everything did install correctly, you can do:

2
docs/fr/user/installation.rst
View file

@ -46,7 +46,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
::
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
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 :

2
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View file

@ -71,7 +71,7 @@
{% block footer %}{% endblock %}
<div id="warning_message">
You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>.
</div>
{% if craue_setting('piwik_enabled') %}