Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-05-01 16:08:49 +02:00
2 changed files with 6 additions and 6 deletions

View File

@@ -17,7 +17,7 @@ The extension is currently under heavy development and not supported until furth
## AUTOMATED TESTING ## AUTOMATED TESTING
We are starting to have unit and functional tests in order to prevent regressions. You can check our travis build below. We are starting to have unit and functional tests in order to prevent regressions. You can check our travis build below.
develop-2.1.x - [![Build Status](https://api.travis-ci.org/board3/Board3-Portal.png?branch=develop-2.1.x)](https://travis-ci.org/board3/Board3-Portal) 2.1.x - [![Build Status](https://travis-ci.org/board3/Board3-Portal.svg?branch=2.1.x)](https://travis-ci.org/board3/Board3-Portal)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/quality-score.png?b=develop-2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=develop-2.1.x) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/quality-score.png?b=develop-2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=develop-2.1.x)
[![Code Coverage](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/coverage.png?b=develop-2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=develop-2.1.x) [![Code Coverage](https://scrutinizer-ci.com/g/board3/Board3-Portal/badges/coverage.png?b=develop-2.1.x)](https://scrutinizer-ci.com/g/board3/Board3-Portal/?branch=develop-2.1.x)

10
composer.lock generated
View File

@@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "nickvergessen/phpbb-tool-trimmessage", "name": "nickvergessen/phpbb-tool-trimmessage",
"version": "1.3.0", "version": "1.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git", "url": "https://github.com/nickvergessen/phpbb-tool-trimmessage.git",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b" "reference": "0ed883bc2d473ec2e84cabb9c9395785daeeebcf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/2a3d8273dc1238dd06454688bcb6496f62f66c3b", "url": "https://api.github.com/repos/nickvergessen/phpbb-tool-trimmessage/zipball/0ed883bc2d473ec2e84cabb9c9395785daeeebcf",
"reference": "2a3d8273dc1238dd06454688bcb6496f62f66c3b", "reference": "0ed883bc2d473ec2e84cabb9c9395785daeeebcf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -46,7 +46,7 @@
], ],
"description": "This tool contains a class, that is able to trim a message from the phpbb message_parser to a maximum length without breaking the bbcodes/smilies and links.", "description": "This tool contains a class, that is able to trim a message from the phpbb message_parser to a maximum length without breaking the bbcodes/smilies and links.",
"homepage": "https://github.com/nickvergessen/phpbb-tool-trimmessage", "homepage": "https://github.com/nickvergessen/phpbb-tool-trimmessage",
"time": "2014-07-06 19:42:34" "time": "2015-04-17 16:41:50"
} }
], ],
"packages-dev": [ "packages-dev": [