aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md5
-rw-r--r--app/config/config.yml6
-rw-r--r--composer.json7
3 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de523f91..ad916426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
1## Changelog 1## Changelog
2 2
3### 2.1.5 2016/11/21
4- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r)
5- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb)
6- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb)
7
3### 2.1.4 2016/11/19 8### 2.1.4 2016/11/19
4- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) 9- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r)
5- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) 10- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
diff --git a/app/config/config.yml b/app/config/config.yml
index 53c26beb..487e934b 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.2.0-dev 33 version: 2.1.5
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'
@@ -218,7 +218,9 @@ fos_oauth_server:
218 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode 218 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
219 service: 219 service:
220 user_provider: fos_user.user_manager 220 user_provider: fos_user.user_manager
221 221 options:
222 refresh_token_lifetime: 1209600
223
222scheb_two_factor: 224scheb_two_factor:
223 trusted_computer: 225 trusted_computer:
224 enabled: true 226 enabled: true
diff --git a/composer.json b/composer.json
index 6d7a7adf..1548d6ec 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
89 "doctrine/doctrine-fixtures-bundle": "~2.2", 89 "doctrine/doctrine-fixtures-bundle": "~2.2",
90 "doctrine/data-fixtures": "~1.1.1", 90 "doctrine/data-fixtures": "~1.1.1",
91 "sensio/generator-bundle": "^3.0", 91 "sensio/generator-bundle": "^3.0",
92 "phpunit/phpunit": "~5.0", 92 "phpunit/phpunit": "~4.0",
93 "symfony/phpunit-bridge": "^3.0", 93 "symfony/phpunit-bridge": "^3.0",
94 "friendsofphp/php-cs-fixer": "~1.9", 94 "friendsofphp/php-cs-fixer": "~1.9",
95 "m6web/redis-mock": "^2.0" 95 "m6web/redis-mock": "^2.0"
@@ -128,7 +128,10 @@
128 "psr-4": { "Tests\\": "tests/" } 128 "psr-4": { "Tests\\": "tests/" }
129 }, 129 },
130 "config": { 130 "config": {
131 "bin-dir": "bin" 131 "bin-dir": "bin",
132 "platform": {
133 "php": "5.5.9"
134 }
132 }, 135 },
133 "minimum-stability": "dev", 136 "minimum-stability": "dev",
134 "prefer-stable": true 137 "prefer-stable": true