11 files changed, 22 insertions, 11 deletions

diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php
index 9adfdc8b..a8d3bcf2 100644
--- a/app/DoctrineMigrations/Version20160812120952.php
+++ b/app/DoctrineMigrations/Version20160812120952.php
@@ -29,7 +29,11 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
+        if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') {
+            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
+        } else {
+            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
+        }
     }
 
     /**
diff --git a/docs/de/conf.py b/docs/de/conf.py
index 8f2d130d..cc9dcdf8 100644
--- a/docs/de/conf.py
+++ b/docs/de/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag-fr'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst
index 953c84ff..084dab74 100644
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@ -11,7 +11,9 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Update auf einem Shared Webhosting
 ----------------------------------
diff --git a/docs/en/conf.py b/docs/en/conf.py
index 86e33704..717b35f1 100644
--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 5c37be95..f547f247 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -11,7 +11,9 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Upgrade on a shared hosting
 ---------------------------
diff --git a/docs/fr/conf.py b/docs/fr/conf.py
index f1fe3967..49a57e2d 100644
--- a/docs/fr/conf.py
+++ b/docs/fr/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag-fr'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst
index e3798979..42aef9c7 100644
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@ -11,7 +11,9 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Mise à jour sur un hébergement mutualisé
 ----------------------------------------
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 968deaf9..95cb31d1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -48,6 +48,7 @@ footer:
     page_title: 'Configuration'
 
 config:
+    page_title: 'Configuration'
     tab_menu:
         settings: 'Paramètres'
         rss: 'RSS'
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 71652760..2c32393f 100644
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -47,7 +47,7 @@ class TagControllerTest extends WallabagCoreTestCase
 
         $this->assertEquals(1, count($entry->getTags()));
 
-        # tag already exists and already assigned
+        // tag already exists and already assigned
         $client->submit($form, $data);
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
 
@@ -58,7 +58,7 @@ class TagControllerTest extends WallabagCoreTestCase
 
         $this->assertEquals(1, count($newEntry->getTags()));
 
-        # tag already exists but still not assigned to this entry
+        // tag already exists but still not assigned to this entry
         $data = [
             'tag[label]' => 'foo',
         ];
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 75b7ee0b..4f103921 100644
--- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -83,7 +83,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
 
     /**
      * Check if Redis is installed.
-     * If not, mark test as skip
+     * If not, mark test as skip.
      */
     protected function checkRedis()
     {
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index f670c925..441d6519 100644
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -37,7 +37,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
         );
         $this->mailer = new \Swift_Mailer($transport);
 
-        $twigTemplate = <<<TWIG
+        $twigTemplate = <<<'TWIG'
 {% block subject %}subject{% endblock %}
 {% block body_html %}html body {{ code }}{% endblock %}
 {% block body_text %}text body {{ support_url }}{% endblock %}