🚀 Prepare v2.0.0 🎂

2024-05-17 08:42:39 +00:00 · 2016-04-03 10:08:22 +02:00 · 2016-04-03 10:08:22 +02:00 · eff75729a1
parent 2ff626a451
commit eff75729a1
9 changed files with 23 additions and 30 deletions
--- 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
--- 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'
--- 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

--- 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

--- 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 %}

-        <div id="warning_message">
-            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') %}
            {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
        {% endif %}
--- 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 @@

    <dl>
        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>

@ -25,9 +25,8 @@

    <dl>
        <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-        <dd><a href="https://doc.wallabag.org/en">english</a></dd>
-        <dd><a href="https://doc.wallabag.org/fr">français</a></dd>
-        <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
+        <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
+        <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>

        <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
        <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
--- 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 @@
    </ul>
    <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
    <ul>
-        <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+        <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
        <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
    </ul>
    <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
--- 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 @@

                    <div id="set1" class="col s12">
                        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
                        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
                        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
                        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
@ -34,9 +34,8 @@
                    <div id="set2" class="col s12">
                        <dl>
                            <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-                            <dd><a href="https://doc.wallabag.org/en">english</a></dd>
-                            <dd><a href="https://doc.wallabag.org/fr">français</a></dd>
-                            <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
+                            <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
+                            <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>

                            <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
                            <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
--- 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 @@
                    <div class="col s12">
                        <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
                        <ul>
-                            <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+                            <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
                            <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
                        </ul>
                    </div>