From eff75729a119c429e1eb526739fd45ff9aa18885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 3 Apr 2016 10:08:22 +0200 Subject: :rocket: Prepare v2.0.0 :birthday: --- README.md | 5 ++--- app/config/config.yml | 2 +- docs/en/user/installation.rst | 12 ++++++------ docs/fr/user/installation.rst | 12 ++++++------ src/Wallabag/CoreBundle/Resources/views/base.html.twig | 4 ---- .../Resources/views/themes/baggy/Static/about.html.twig | 7 +++---- .../Resources/views/themes/baggy/Static/howto.html.twig | 2 +- .../Resources/views/themes/material/Static/about.html.twig | 7 +++---- .../Resources/views/themes/material/Static/howto.html.twig | 2 +- 9 files changed, 23 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index e175b6c3..0e59e40f 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,7 @@ 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: @@ -17,7 +16,7 @@ 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 + git checkout 2.0.0 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod php bin/console server:run --env=prod diff --git a/app/config/config.yml b/app/config/config.yml index ebbeeed1..a8766694 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,7 +28,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.0-beta.2 + version: 2.0.0 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 11ad54fd..bc35a02b 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -4,9 +4,9 @@ Install wallabag Requirements ------------ -wallabag is compatible with php >= 5.5, including php 7. +wallabag is compatible with PHP >= 5.5, including PHP 7. -You'll need the following extensions for wallabag to work. Some of these may already activated in your version of php, so you may not have to install all corresponding packages. +You'll need the following extensions for wallabag to work. Some of these may already activated in your version of PHP, so you may not have to install all corresponding packages. - php-session - php-ctype @@ -25,9 +25,9 @@ You'll need the following extensions for wallabag to work. Some of these may alr wallabag uses PDO to connect to database, so you'll need one of: -- php-pdo_mysql -- php-pdo_sqlite -- php-pdo_pgsql +- pdo_mysql +- pdo_sqlite +- pdo_pgsql and it's corresponding database server. @@ -50,7 +50,7 @@ To install wallabag itself, you must run these two commands: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.0-beta.2 + git checkout 2.0.0 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index c145fbc7..489304d6 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -4,9 +4,9 @@ Installer wallabag Pré-requis ------------ -wallabag est compatible avec php >= 5.5, php 7 inclus. +wallabag est compatible avec PHP >= 5.5, PHP 7 inclus. -Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de php, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants. +Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de PHP, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants. - php-session - php-ctype @@ -25,9 +25,9 @@ Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi : -- php-pdo_mysql -- php-pdo_sqlite -- php-pdo_pgsql +- pdo_mysql +- pdo_sqlite +- pdo_pgsql Installation ------------ @@ -48,7 +48,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.0-beta.2 + git checkout 2.0.0 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index dacdb9ca..f024b633 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -70,10 +70,6 @@ {% block footer %}{% endblock %} -
- You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to our issues list and open a new one if necessary. -
- {% if craue_setting('piwik_enabled') %} {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 5c0046d1..5687e48c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig @@ -7,7 +7,7 @@
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
@@ -25,9 +25,8 @@
{{ 'about.getting_help.documentation'|trans }}
-
english
-
français
-
deutsch
+
english
+
français
{{ 'about.getting_help.bug_reports'|trans }}
{{ 'about.getting_help.support'|trans|raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index 8da1afa0..eab092c7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig @@ -11,7 +11,7 @@

{{ 'howto.top_menu.browser_addons'|trans }}

{{ 'howto.top_menu.mobile_apps'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index a294b74d..4b1fdcce 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig @@ -21,7 +21,7 @@
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
@@ -34,9 +34,8 @@
{{ 'about.getting_help.documentation'|trans }}
-
english
-
français
-
deutsch
+
english
+
français
{{ 'about.getting_help.bug_reports'|trans }}
{{ 'about.getting_help.support'|trans|raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 15b548d8..4354a6b7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -18,7 +18,7 @@
{{ 'howto.top_menu.browser_addons'|trans }}
-- cgit v1.2.3