mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-22 23:56:29 +00:00
Merge remote-tracking branch 'origin/master' into 2.2
This commit is contained in:
commit
eb2d613c3e
3 changed files with 14 additions and 4 deletions
|
@ -1,5 +1,10 @@
|
|||
## Changelog
|
||||
|
||||
### 2.1.5 2016/11/21
|
||||
- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r)
|
||||
- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb)
|
||||
- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb)
|
||||
|
||||
### 2.1.4 2016/11/19
|
||||
- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r)
|
||||
- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
|
||||
|
|
|
@ -30,7 +30,7 @@ framework:
|
|||
assets: ~
|
||||
|
||||
wallabag_core:
|
||||
version: 2.2.0-dev
|
||||
version: 2.1.5
|
||||
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
|
||||
languages:
|
||||
en: 'English'
|
||||
|
@ -218,7 +218,9 @@ fos_oauth_server:
|
|||
auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
|
||||
service:
|
||||
user_provider: fos_user.user_manager
|
||||
|
||||
options:
|
||||
refresh_token_lifetime: 1209600
|
||||
|
||||
scheb_two_factor:
|
||||
trusted_computer:
|
||||
enabled: true
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
"doctrine/doctrine-fixtures-bundle": "~2.2",
|
||||
"doctrine/data-fixtures": "~1.1.1",
|
||||
"sensio/generator-bundle": "^3.0",
|
||||
"phpunit/phpunit": "~5.0",
|
||||
"phpunit/phpunit": "~4.0",
|
||||
"symfony/phpunit-bridge": "^3.0",
|
||||
"friendsofphp/php-cs-fixer": "~1.9",
|
||||
"m6web/redis-mock": "^2.0"
|
||||
|
@ -128,7 +128,10 @@
|
|||
"psr-4": { "Tests\\": "tests/" }
|
||||
},
|
||||
"config": {
|
||||
"bin-dir": "bin"
|
||||
"bin-dir": "bin",
|
||||
"platform": {
|
||||
"php": "5.5.9"
|
||||
}
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true
|
||||
|
|
Loading…
Reference in a new issue