Compare commits

..

1 Commits
2.1.5 ... 2.1.4

Author SHA1 Message Date
5fdb74b88c Release wallabag 2.1.4 2016-11-19 13:51:13 +01:00
4 changed files with 284 additions and 100 deletions

View File

@ -1,15 +1,6 @@
## 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 cant work on PostgreSQL <= 9.1 (@j0k3r)
- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
- [#2603](https://github.com/wallabag/wallabag/pull/2603) Fix clear-cache problem using —no-dev (@j0k3r)
- [#2596](https://github.com/wallabag/wallabag/pull/2596) Prepare wallabag 2.1.4 :rocket: (@nicosomb)
### 2.1.4 2016/11/18
- [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
- [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
- [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)

View File

@ -30,7 +30,7 @@ framework:
assets: ~
wallabag_core:
version: 2.1.5
version: 2.1.4
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'

View File

@ -88,7 +88,7 @@
"doctrine/doctrine-fixtures-bundle": "~2.2",
"doctrine/data-fixtures": "~1.1.1",
"sensio/generator-bundle": "^3.0",
"phpunit/phpunit": "~4.0",
"phpunit/phpunit": "~5.0",
"symfony/phpunit-bridge": "^3.0",
"friendsofphp/php-cs-fixer": "~1.9",
"m6web/redis-mock": "^2.0"
@ -125,10 +125,7 @@
"psr-4": { "Tests\\": "tests/" }
},
"config": {
"bin-dir": "bin",
"platform": {
"php": "5.5.9"
}
"bin-dir": "bin"
},
"minimum-stability": "dev",
"prefer-stable": true

364
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "c284daa67afb12c6dee10b308de4b826",
"content-hash": "94aafe19e01191d04866b7e32ae58c92",
"hash": "dacb42e846faf288289e64517edbdd57",
"content-hash": "4d9e031cfa60a8cc25f3f6683a6ceb74",
"packages": [
{
"name": "behat/transliterator",
@ -109,35 +109,35 @@
},
{
"name": "doctrine/annotations",
"version": "v1.2.7",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
"reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/30e07cf03edc3cd3ef579d0dd4dd8c58250799a5",
"reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
"php": "^5.6 || ^7.0"
},
"require-dev": {
"doctrine/cache": "1.*",
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "^5.6.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "1.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Annotations\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -173,7 +173,7 @@
"docblock",
"parser"
],
"time": "2015-08-31 12:32:49"
"time": "2016-10-24 11:45:47"
},
{
"name": "doctrine/cache",
@ -1917,16 +1917,16 @@
},
{
"name": "hoa/event",
"version": "1.16.11.19",
"version": "1.16.03.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Event.git",
"reference": "a2cea8dc46a133517ec322520c3a8bf015ac0cbb"
"reference": "b1577069d63d6efc559406f3bc31813ac33e76b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hoaproject/Event/zipball/a2cea8dc46a133517ec322520c3a8bf015ac0cbb",
"reference": "a2cea8dc46a133517ec322520c3a8bf015ac0cbb",
"url": "https://api.github.com/repos/hoaproject/Event/zipball/b1577069d63d6efc559406f3bc31813ac33e76b8",
"reference": "b1577069d63d6efc559406f3bc31813ac33e76b8",
"shasum": ""
},
"require": {
@ -1958,18 +1958,18 @@
},
{
"name": "Hoa community",
"homepage": "https://hoa-project.net/"
"homepage": "http://hoa-project.net/"
}
],
"description": "The Hoa\\Event library.",
"homepage": "https://hoa-project.net/",
"homepage": "http://hoa-project.net/",
"keywords": [
"event",
"library",
"listener",
"observer"
],
"time": "2016-11-19 18:56:37"
"time": "2016-03-15 14:49:59"
},
{
"name": "hoa/exception",
@ -2089,16 +2089,16 @@
},
{
"name": "hoa/iterator",
"version": "2.16.11.19",
"version": "2.16.03.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Iterator.git",
"reference": "41db0d981caafe094a0b9801542b5dc74a2d175e"
"reference": "60bdefab8db17717871a11101dedec60572f95b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hoaproject/Iterator/zipball/41db0d981caafe094a0b9801542b5dc74a2d175e",
"reference": "41db0d981caafe094a0b9801542b5dc74a2d175e",
"url": "https://api.github.com/repos/hoaproject/Iterator/zipball/60bdefab8db17717871a11101dedec60572f95b8",
"reference": "60bdefab8db17717871a11101dedec60572f95b8",
"shasum": ""
},
"require": {
@ -2130,16 +2130,16 @@
},
{
"name": "Hoa community",
"homepage": "https://hoa-project.net/"
"homepage": "http://hoa-project.net/"
}
],
"description": "The Hoa\\Iterator library.",
"homepage": "https://hoa-project.net/",
"homepage": "http://hoa-project.net/",
"keywords": [
"iterator",
"library"
],
"time": "2016-11-19 18:54:01"
"time": "2016-03-15 14:51:54"
},
{
"name": "hoa/math",
@ -5439,16 +5439,16 @@
},
{
"name": "symfony/symfony",
"version": "v3.1.7",
"version": "v3.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
"reference": "db1c32c7237a6594e5e1974524c973d18066b141"
"reference": "8f345c38c2618d1513b9afb8ad5ac8f7b0b31d86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/db1c32c7237a6594e5e1974524c973d18066b141",
"reference": "db1c32c7237a6594e5e1974524c973d18066b141",
"url": "https://api.github.com/repos/symfony/symfony/zipball/8f345c38c2618d1513b9afb8ad5ac8f7b0b31d86",
"reference": "8f345c38c2618d1513b9afb8ad5ac8f7b0b31d86",
"shasum": ""
},
"require": {
@ -5461,7 +5461,7 @@
"symfony/polyfill-php56": "~1.0",
"symfony/polyfill-php70": "~1.0",
"symfony/polyfill-util": "~1.0",
"twig/twig": "~1.28|~2.0"
"twig/twig": "~1.27|~2.0"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0",
@ -5576,7 +5576,7 @@
"keywords": [
"framework"
],
"time": "2016-11-21 02:44:44"
"time": "2016-10-27 02:38:53"
},
{
"name": "tecnickcom/tcpdf",
@ -6433,6 +6433,48 @@
],
"time": "2016-10-30 19:34:36"
},
{
"name": "myclabs/deep-copy",
"version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/399c1f9781e222f6eb6cc238796f5200d1b7f108",
"reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"doctrine/collections": "1.*",
"phpunit/phpunit": "~4.1"
},
"type": "library",
"autoload": {
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Create deep copies (clones) of your objects",
"homepage": "https://github.com/myclabs/DeepCopy",
"keywords": [
"clone",
"copy",
"duplicate",
"object",
"object graph"
],
"time": "2016-10-31 17:19:45"
},
{
"name": "phpdocumentor/reflection-common",
"version": "1.0",
@ -6643,39 +6685,40 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "2.2.4",
"version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
"reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6cba06ff75a1a63a71033e1a01b89056f3af1e8d",
"reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"php": "^5.6 || ^7.0",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3",
"sebastian/environment": "^1.3.2",
"sebastian/version": "~1.0"
"phpunit/php-token-stream": "^1.4.2",
"sebastian/code-unit-reverse-lookup": "~1.0",
"sebastian/environment": "^1.3.2 || ^2.0",
"sebastian/version": "~1.0|~2.0"
},
"require-dev": {
"ext-xdebug": ">=2.1.4",
"phpunit/phpunit": "~4"
"phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-dom": "*",
"ext-xdebug": ">=2.2.1",
"ext-xdebug": ">=2.4.0",
"ext-xmlwriter": "*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
"dev-master": "4.0.x-dev"
}
},
"autoload": {
@ -6701,7 +6744,7 @@
"testing",
"xunit"
],
"time": "2015-10-06 15:47:00"
"time": "2016-11-01 05:06:24"
},
{
"name": "phpunit/php-file-iterator",
@ -6886,40 +6929,52 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.28",
"version": "5.6.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225"
"reference": "4ddb822f1de421b4cadb47570a525fd7d9359493"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/558a3a0d28b4cb7e4a593a4fbd2220e787076225",
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ddb822f1de421b4cadb47570a525fd7d9359493",
"reference": "4ddb822f1de421b4cadb47570a525fd7d9359493",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-json": "*",
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "~2.1",
"phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
"phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
"sebastian/environment": "~1.3",
"sebastian/environment": "^1.3 || ^2.0",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
"sebastian/object-enumerator": "~1.0",
"sebastian/resource-operations": "~1.0",
"sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
"conflict": {
"phpdocumentor/reflection-docblock": "3.0.2",
"sebastian/object-enumerator": "1.0.1",
"sebastian/recursion-context": "1.0.3 || 1.0.4"
},
"require-dev": {
"ext-pdo": "*"
},
"suggest": {
"ext-xdebug": "*",
"phpunit/php-invoker": "~1.1"
},
"bin": [
@ -6928,7 +6983,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.8.x-dev"
"dev-master": "5.6.x-dev"
}
},
"autoload": {
@ -6954,30 +7009,33 @@
"testing",
"xunit"
],
"time": "2016-11-14 06:25:28"
"time": "2016-11-18 09:50:51"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "2.3.8",
"version": "3.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
"reference": "45026c8383187ad1dcb14fbfec77dced265b9cfc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/45026c8383187ad1dcb14fbfec77dced265b9cfc",
"reference": "45026c8383187ad1dcb14fbfec77dced265b9cfc",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": ">=5.3.3",
"phpunit/php-text-template": "~1.2",
"sebastian/exporter": "~1.2"
"php": "^5.6 || ^7.0",
"phpunit/php-text-template": "^1.2",
"sebastian/exporter": "^1.2 || ^2.0"
},
"conflict": {
"phpunit/phpunit": "<5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
"phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@ -6985,7 +7043,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3.x-dev"
"dev-master": "3.2.x-dev"
}
},
"autoload": {
@ -7010,7 +7068,52 @@
"mock",
"xunit"
],
"time": "2015-10-02 06:51:40"
"time": "2016-11-19 09:07:46"
},
{
"name": "sebastian/code-unit-reverse-lookup",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "~5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2016-02-13 06:45:14"
},
{
"name": "sebastian/comparator",
@ -7296,6 +7399,52 @@
],
"time": "2015-10-12 03:26:01"
},
{
"name": "sebastian/object-enumerator",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
"reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
"reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
"shasum": ""
},
"require": {
"php": ">=5.6",
"sebastian/recursion-context": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "~5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2016-01-28 13:25:10"
},
{
"name": "sebastian/recursion-context",
"version": "1.0.2",
@ -7350,20 +7499,70 @@
"time": "2015-11-11 19:50:13"
},
{
"name": "sebastian/version",
"version": "1.0.6",
"name": "sebastian/resource-operations",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
"url": "https://github.com/sebastianbergmann/resource-operations.git",
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"shasum": ""
},
"require": {
"php": ">=5.6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28 20:34:47"
},
{
"name": "sebastian/version",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
"reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
"reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
@ -7382,7 +7581,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2015-06-21 13:59:46"
"time": "2016-02-04 12:56:52"
},
{
"name": "sensio/generator-bundle",
@ -7438,16 +7637,16 @@
},
{
"name": "symfony/phpunit-bridge",
"version": "v3.1.7",
"version": "v3.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "c80098acb81e604eb18030c5e444032ef948f9e7"
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c80098acb81e604eb18030c5e444032ef948f9e7",
"reference": "c80098acb81e604eb18030c5e444032ef948f9e7",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
"shasum": ""
},
"require": {
@ -7489,7 +7688,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
"time": "2016-11-17 10:59:24"
"time": "2016-08-19 06:48:39"
},
{
"name": "webmozart/assert",
@ -7573,8 +7772,5 @@
"ext-tokenizer": "*",
"ext-pdo": "*"
},
"platform-dev": [],
"platform-overrides": {
"php": "5.5.9"
}
"platform-dev": []
}