aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-02-29 21:34:36 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-02-29 21:34:36 +0100
commit6e3d65ccb085752c8cc9b95c32add546260f5b85 (patch)
tree624a99863f7a933ae6b4eab58d27fdb938914bf7
parent8808b79230130d2b985748954833a80e57fffd6c (diff)
downloadwallabag-6e3d65ccb085752c8cc9b95c32add546260f5b85.tar.gz
wallabag-6e3d65ccb085752c8cc9b95c32add546260f5b85.tar.zst
wallabag-6e3d65ccb085752c8cc9b95c32add546260f5b85.zip
Prepare wallabag for first beta :rocket:
-rw-r--r--README.md2
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/fr/user/installation.rst2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig2
5 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index b1086885..b7940b36 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Keep in mind it's an **unstable** branch, everything can be broken :)
14If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands: 14If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
15 15
16``` 16```
17SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev 17SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
18php bin/console wallabag:install --env=prod 18php bin/console wallabag:install --env=prod
19php bin/console server:run --env=prod 19php bin/console server:run --env=prod
20``` 20```
diff --git a/app/config/config.yml b/app/config/config.yml
index 51cc049e..58ab83b0 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.0-alpha.2 31 version: 2.0.0-beta.1
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 760fd4d2..97e581e1 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -48,7 +48,7 @@ To install wallabag itself, you must run these two commands:
48 48
49:: 49::
50 50
51 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev 51 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
52 php bin/console wallabag:install --env=prod 52 php bin/console wallabag:install --env=prod
53 53
54To start php's build-in server and test if everything did install correctly, you can do: 54To start php's build-in server and test if everything did install correctly, you can do:
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index e4ff49ce..a2a5dabf 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -46,7 +46,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
46 46
47:: 47::
48 48
49 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev 49 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
50 php bin/console wallabag:install --env=prod 50 php bin/console wallabag:install --env=prod
51 51
52Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : 52Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 2748c7e3..4c0d4fee 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -71,7 +71,7 @@
71 {% block footer %}{% endblock %} 71 {% block footer %}{% endblock %}
72 72
73 <div id="warning_message"> 73 <div id="warning_message">
74 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> 74 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>.
75 </div> 75 </div>
76 76
77 {% if craue_setting('piwik_enabled') %} 77 {% if craue_setting('piwik_enabled') %}