aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2018-02-21 19:43:22 +0100
committerVirtualTam <virtualtam@flibidi.net>2018-02-21 19:43:22 +0100
commit9a6183e852efdc8100c09fcc238b27d10d6e1b10 (patch)
treea35d6ec10d12a618ada64d4486be8faa23720f22
parent99b083999eee26c877528241d6877f64b59c205b (diff)
parentc648fc34f882ca6a62f5a44d1826bbd2b9852845 (diff)
downloadShaarli-9a6183e852efdc8100c09fcc238b27d10d6e1b10.tar.gz
Shaarli-9a6183e852efdc8100c09fcc238b27d10d6e1b10.tar.zst
Shaarli-9a6183e852efdc8100c09fcc238b27d10d6e1b10.zip
Merge tag 'v0.8.6' into stable
Release v0.8.6
-rw-r--r--CHANGELOG.md6
-rw-r--r--index.php4
-rw-r--r--shaarli_version.php2
-rw-r--r--tests/ApplicationUtilsTest.php2
4 files changed, 10 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51c60d4c..84dc18cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
5and this project adheres to [Semantic Versioning](http://semver.org/). 5and this project adheres to [Semantic Versioning](http://semver.org/).
6 6
7 7
8## [v0.8.6](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-02-19
9
10### Changed
11- Run version check tests against the 'stable' branch
12
13
8## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04 14## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04
9 15
10 **XSS vulnerability fixed. Please update.** 16 **XSS vulnerability fixed. Please update.**
diff --git a/index.php b/index.php
index 6060bd9e..8a0be951 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2/** 2/**
3 * Shaarli v0.8.5 - Shaare your links... 3 * Shaarli v0.8.6 - Shaare your links...
4 * 4 *
5 * The personal, minimalist, super-fast, database free, bookmarking service. 5 * The personal, minimalist, super-fast, database free, bookmarking service.
6 * 6 *
@@ -25,7 +25,7 @@ if (date_default_timezone_get() == '') {
25/* 25/*
26 * PHP configuration 26 * PHP configuration
27 */ 27 */
28define('shaarli_version', '0.8.2'); 28define('shaarli_version', '0.8.6');
29 29
30// http://server.com/x/shaarli --> /shaarli/ 30// http://server.com/x/shaarli --> /shaarli/
31define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0))); 31define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0)));
diff --git a/shaarli_version.php b/shaarli_version.php
index a7b8799a..4d882663 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
<?php /* 0.8.5 */ ?> <?php /* 0.8.6 */ ?>
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 861b8d4e..4a0975bf 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -64,7 +64,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
64 self::$versionPattern, 64 self::$versionPattern,
65 ApplicationUtils::getLatestGitVersionCode( 65 ApplicationUtils::getLatestGitVersionCode(
66 'https://raw.githubusercontent.com/shaarli/Shaarli/' 66 'https://raw.githubusercontent.com/shaarli/Shaarli/'
67 .'master/shaarli_version.php', 67 .'stable/shaarli_version.php',
68 $testTimeout 68 $testTimeout
69 ) 69 )
70 ); 70 );