From 9a1b107fd3d05dfa7f4cfb74d52293d0fef4aff7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 5 Mar 2018 17:07:03 +0100 Subject: [PATCH] release 2.18 --- NEWS.md | 2 +- README.md | 2 +- _docs/website/index.html | 4 ++-- common.php | 2 +- docs/api-description.json | 2 +- package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1fea5367e7..ca4785722c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ # selfoss news -## 2.18 – Unreleased +## 2.18 – 2018-03-05 ### New features - Full-text RSS spout is now able to extract content from PDFs ([#897](https://github.com/SSilence/selfoss/pull/897)) - URL is no longer cleaned when changing spout ([#906](https://github.com/SSilence/selfoss/pull/906)) diff --git a/README.md b/README.md index c2425c4886..bccb5e7760 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ selfoss Copyright (c) 2015 Tobias Zeising, tobias.zeising@aditu.de https://selfoss.aditu.de Licensed under the GPLv3 license -Version 2.18-SNAPSHOT +Version 2.18 DOWNLOAD -------- diff --git a/_docs/website/index.html b/_docs/website/index.html index 679d661ad3..7f56272a34 100644 --- a/_docs/website/index.html +++ b/_docs/website/index.html @@ -27,7 +27,7 @@

selfoss

  • documentation
  • about
  • forum
    • -
  • download
    • +
  • download
    • @@ -36,7 +36,7 @@

    selfoss

    - download selfoss 2.18-SNAPSHOT + download selfoss 2.18 donate diff --git a/common.php b/common.php index e7d98e44ec..2b0f09b964 100644 --- a/common.php +++ b/common.php @@ -14,7 +14,7 @@ $f3 = $f3 = Base::instance(); $f3->set('DEBUG', 0); -$f3->set('version', '2.18-SNAPSHOT'); +$f3->set('version', '2.18'); $f3->set('AUTOLOAD', false); $f3->set('cache', __DIR__ . '/data/cache'); $f3->set('BASEDIR', __DIR__); diff --git a/docs/api-description.json b/docs/api-description.json index dcc67b7b4c..f20234bef3 100644 --- a/docs/api-description.json +++ b/docs/api-description.json @@ -3,7 +3,7 @@ "servers": [], "info": { "description": "You can access selfoss by using the same backend as selfoss user interface: The RESTful HTTP JSON API. There are a few urls where you can get information from selfoss and some for updating data. Assume you want all tags for rendering this in your own app. You have to make an HTTP GET call on the url /tags:\n\n```\nGET http://yourselfossurl.com/tags\n```\nThe result is following JSON formatted response (in this example two tags “blog” and “deviantart” are available:\n\n```\n[{\"tag\":\"blog\",\"color\":\"#251f10\",\"unread\":\"1\"},\n{\"tag\":\"deviantart\",\"color\":\"#e78e5c\",\"unread\":\"0\"}]\n```\n\nFollowing docs shows you which calls are possible and which response you can expect.", - "version": "2.18-SNAPSHOT", + "version": "2.18", "title": "selfoss" }, "tags": [ diff --git a/package.json b/package.json index 2c040f73ac..5cfe88adb8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "selfoss", "description": "selfoss", - "ver": "2.18-SNAPSHOT", + "ver": "2.18", "repository": { "type": "git", "url": "https://github.com/SSilence/selfoss.git"