diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-08-11 14:41:32 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-08-11 14:41:32 +0200 |
commit | 1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715 (patch) | |
tree | 8bb5e4ee079bc2db3cf7b191a0d4222c624b6221 | |
parent | e0a77f2cceba5295b04add1ab177020c8b028df5 (diff) | |
parent | 630ebca2b6359e942e5b6c057cca2b6069c1093a (diff) | |
download | Shaarli-1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715.tar.gz Shaarli-1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715.tar.zst Shaarli-1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715.zip |
Merge tag 'v0.10.2' into latest
Release v0.10.2
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | composer.lock | 12 | ||||
-rw-r--r-- | shaarli_version.php | 2 |
5 files changed, 14 insertions, 10 deletions
@@ -1,4 +1,4 @@ | |||
1 | 682 ArthurHoaro <arthur@hoa.ro> | 1 | 687 ArthurHoaro <arthur@hoa.ro> |
2 | 355 VirtualTam <virtualtam@flibidi.net> | 2 | 355 VirtualTam <virtualtam@flibidi.net> |
3 | 195 nodiscc <nodiscc@gmail.com> | 3 | 195 nodiscc <nodiscc@gmail.com> |
4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> | 4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> |
diff --git a/CHANGELOG.md b/CHANGELOG.md index a8697804..8e2464a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. | |||
4 | The format is based on [Keep a Changelog](http://keepachangelog.com/) | 4 | The format is based on [Keep a Changelog](http://keepachangelog.com/) |
5 | and this project adheres to [Semantic Versioning](http://semver.org/). | 5 | and this project adheres to [Semantic Versioning](http://semver.org/). |
6 | 6 | ||
7 | ## [v0.10.2](https://github.com/shaarli/Shaarli/releases/tag/v0.10.2) - 2018-08-11 | ||
8 | |||
9 | ### Fixed | ||
10 | |||
11 | - Docker build | ||
12 | |||
7 | ## [v0.10.1](https://github.com/shaarli/Shaarli/releases/tag/v0.10.1) - 2018-08-11 | 13 | ## [v0.10.1](https://github.com/shaarli/Shaarli/releases/tag/v0.10.1) - 2018-08-11 |
8 | 14 | ||
9 | ### Changed | 15 | ### Changed |
@@ -9,7 +9,7 @@ _It is designed to be personal (single-user), fast and handy._ | |||
9 | [![](https://img.shields.io/badge/stable-v0.9.7-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) | 9 | [![](https://img.shields.io/badge/stable-v0.9.7-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) |
10 | [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli) | 10 | [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli) |
11 | • | 11 | • |
12 | [![](https://img.shields.io/badge/latest-v0.10.0-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) | 12 | [![](https://img.shields.io/badge/latest-v0.10.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.10.1) |
13 | [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli) | 13 | [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli) |
14 | • | 14 | • |
15 | [![](https://img.shields.io/badge/master-v0.10.x-blue.svg)](https://github.com/shaarli/Shaarli) | 15 | [![](https://img.shields.io/badge/master-v0.10.x-blue.svg)](https://github.com/shaarli/Shaarli) |
diff --git a/composer.lock b/composer.lock index b5412f3d..22c97fa9 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -8,21 +8,19 @@ | |||
8 | "packages": [ | 8 | "packages": [ |
9 | { | 9 | { |
10 | "name": "arthurhoaro/web-thumbnailer", | 10 | "name": "arthurhoaro/web-thumbnailer", |
11 | "version": "v1.3.0", | 11 | "version": "v1.3.1", |
12 | "source": { | 12 | "source": { |
13 | "type": "git", | 13 | "type": "git", |
14 | "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", | 14 | "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", |
15 | "reference": "01ba9931ac8edc4bd9da186cb5d7f7f84bf78df3" | 15 | "reference": "7142bd94ec93719a756a7012ebb8e1c5813c6860" |
16 | }, | 16 | }, |
17 | "dist": { | 17 | "dist": { |
18 | "type": "zip", | 18 | "type": "zip", |
19 | "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/01ba9931ac8edc4bd9da186cb5d7f7f84bf78df3", | 19 | "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/7142bd94ec93719a756a7012ebb8e1c5813c6860", |
20 | "reference": "01ba9931ac8edc4bd9da186cb5d7f7f84bf78df3", | 20 | "reference": "7142bd94ec93719a756a7012ebb8e1c5813c6860", |
21 | "shasum": "" | 21 | "shasum": "" |
22 | }, | 22 | }, |
23 | "require": { | 23 | "require": { |
24 | "ext-gd": "*", | ||
25 | "ext-json": "*", | ||
26 | "php": ">=5.6", | 24 | "php": ">=5.6", |
27 | "phpunit/php-text-template": "^1.2" | 25 | "phpunit/php-text-template": "^1.2" |
28 | }, | 26 | }, |
@@ -54,7 +52,7 @@ | |||
54 | } | 52 | } |
55 | ], | 53 | ], |
56 | "description": "PHP library which will retrieve a thumbnail for any given URL", | 54 | "description": "PHP library which will retrieve a thumbnail for any given URL", |
57 | "time": "2018-08-11T11:24:03+00:00" | 55 | "time": "2018-08-11T12:21:52+00:00" |
58 | }, | 56 | }, |
59 | { | 57 | { |
60 | "name": "container-interop/container-interop", | 58 | "name": "container-interop/container-interop", |
diff --git a/shaarli_version.php b/shaarli_version.php index 755d60b5..912ca530 100644 --- a/shaarli_version.php +++ b/shaarli_version.php | |||
@@ -1 +1 @@ | |||
<?php /* 0.10.1 */ ?> | <?php /* 0.10.2 */ ?> | ||