aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--README.md3
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/de/user/installation.rst2
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.y.rst4
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.y.rst4
-rw-r--r--docs/fr/user/installation.rst2
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.y.rst4
9 files changed, 24 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf48ae38..11ba68ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
2 2
3All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). 3All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
4 4
5## [2.1.1] - 2016-10-03
6
7### Changed
8
9- [#2340](https://github.com/wallabag/wallabag/pull/2340) Updated german translation (Strubbl)
10- [#2341](https://github.com/wallabag/wallabag/pull/2341) Updated polish translation (Mateusz Rumiński)
11
12### Fixed
13
14- [#2338](https://github.com/wallabag/wallabag/pull/2338) Fixed 2.1 installation (Jeremy Benoist)
15- [#2345](https://github.com/wallabag/wallabag/issues/2345) Fixed 2.0.x update (Jeremy Benoist)
16
5## [2.1.0] - 2016-10-03 17## [2.1.0] - 2016-10-03
6 18
7### Added 19### Added
diff --git a/README.md b/README.md
index 0936f666..048315c0 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,9 @@ Then you can install wallabag by executing the following commands:
16``` 16```
17 git clone https://github.com/wallabag/wallabag.git 17 git clone https://github.com/wallabag/wallabag.git
18 cd wallabag 18 cd wallabag
19 git checkout 2.1.0 19 git checkout 2.1.1
20 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 20 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
21 php bin/console wallabag:install --env=prod
21 php bin/console server:run --env=prod 22 php bin/console server:run --env=prod
22``` 23```
23 24
diff --git a/app/config/config.yml b/app/config/config.yml
index fbebfee7..2475ada8 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.1.0 33 version: 2.1.1
34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
35 languages: 35 languages:
36 en: 'English' 36 en: 'English'
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index c438761f..3578dca9 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -55,7 +55,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
55 55
56 git clone https://github.com/wallabag/wallabag.git 56 git clone https://github.com/wallabag/wallabag.git
57 cd wallabag 57 cd wallabag
58 git checkout 2.1.0 58 git checkout 2.1.1 --force
59 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 59 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
60 php bin/console wallabag:install --env=prod 60 php bin/console wallabag:install --env=prod
61 61
diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst
index 7319a18a..8ee2ae59 100644
--- a/docs/de/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst
@@ -7,14 +7,14 @@ Wenn du den Import von Pocket durch das Hinzufügen des Consumer Key in den inte
7Update auf einem dedizierten Webserver 7Update auf einem dedizierten Webserver
8-------------------------------------- 8--------------------------------------
9 9
10Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag-Installation auf die neueste Version zu aktualisieren, führe die folgenden Kommandos in deinem wallabag-Ordner aus (ersetze ``2.1.0`` mit der neuesten Releasenummer): 10Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag-Installation auf die neueste Version zu aktualisieren, führe die folgenden Kommandos in deinem wallabag-Ordner aus (ersetze ``2.1.1`` mit der neuesten Releasenummer):
11 11
12:: 12::
13 13
14 rm -rf var/cache/* 14 rm -rf var/cache/*
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.0 --force
18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 833a36a6..bab8f0a5 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands:
54 54
55 git clone https://github.com/wallabag/wallabag.git 55 git clone https://github.com/wallabag/wallabag.git
56 cd wallabag 56 cd wallabag
57 git checkout 2.1.0 57 git checkout 2.1.1 --force
58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
59 php bin/console wallabag:install --env=prod 59 php bin/console wallabag:install --env=prod
60 60
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index ce5b5441..649ab6ca 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -7,14 +7,14 @@ Before this migration, if you configured the Pocket import by adding your consum
7Upgrade on a dedicated web server 7Upgrade on a dedicated web server
8--------------------------------- 8---------------------------------
9 9
10The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.0`` by the last release number): 10The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.1`` by the last release number):
11 11
12:: 12::
13 13
14 rm -rf var/cache/* 14 rm -rf var/cache/*
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.1 --force
18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index cba8444a..fecdea0f 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -52,7 +52,7 @@ Pour installer wallabag, vous devez exécuter ces commandes :
52 52
53 git clone https://github.com/wallabag/wallabag.git 53 git clone https://github.com/wallabag/wallabag.git
54 cd wallabag 54 cd wallabag
55 git checkout 2.1.0 55 git checkout 2.1.1 --force
56 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 56 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
57 php bin/console wallabag:install --env=prod 57 php bin/console wallabag:install --env=prod
58 58
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
index a059cfb8..42136212 100644
--- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
@@ -7,14 +7,14 @@ Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajouta
7Mise à jour sur un serveur dédié 7Mise à jour sur un serveur dédié
8-------------------------------- 8--------------------------------
9 9
10La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.0`` par le numéro de la dernière version) : 10La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.1`` par le numéro de la dernière version) :
11 11
12:: 12::
13 13
14 rm -rf var/cache/* 14 rm -rf var/cache/*
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.1 --force
18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod