semantic versioning

7 files changed, 16 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8267cf14..5fe36c861 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
-owncloud-news (4.001)
+owncloud-news (4.0.0)
+* **Enhancement**: Calculate item ids differently which leads to unpreventable readding of read articles
 * **Enhancement**: Get rid of cacheCuration setting and add maxRedirects setting in config.ini
 * **Enhancement**: Get rid SimplePie feed parser library and switch to PicoFeed because SimplePie is unmaintained and full of bugs
+* **Enhancement**: Faster feed updates due to proper HTTP cache headers thanks to picoFeed
 * **Enhancement**: Use ownCloud internal proxy settings
 * **Enhancement**: Also provide feed last modified and etag headers over API
 * **Enhancement**: Allow to turn off article purging by setting a negative number
+* **Enhancement**: Switch to semantic versioning
 
 owncloud-news (3.406)
 * **Enhancement**: Make config.ini editable in the admin interface
diff --git a/appinfo/app.json b/appinfo/app.json
index a638e0e9b..8110b748a 100644
--- a/appinfo/app.json
+++ b/appinfo/app.json
@@ -3,7 +3,7 @@
     "id": "news",
     "description": "An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory",
     "licence": "AGPL",
-    "version": "4.0.1",
+    "version": "4.0.0",
     "authors": [
         {
             "name": "Bernhard Posselt",
diff --git a/appinfo/database.xml b/appinfo/database.xml
index 3ee6a5261..5643ea5b6 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -96,6 +96,11 @@
                 <notnull>true</notnull>
             </field>
             <field>
+                <name>location</name>
+                <type>clob</type>
+                <notnull>false</notnull>
+            </field>
+            <field>
                 <name>title</name>
                 <type>clob</type>
                 <notnull>true</notnull>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 83651bb04..1234286d1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -4,7 +4,7 @@
     <name>News</name>
     <description>An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory</description>
     <licence>AGPL</licence>
-    <version>3.901</version>
+    <version>3.999.3</version>
     <require>7.0.3</require>
     <author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author>
 </info>
diff --git a/db/feed.php b/db/feed.php
index 373058320..987e1e674 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -22,6 +22,8 @@ use \OCP\AppFramework\Db\Entity;
  * @method void setUserId(string $value)
  * @method string getUrlHash()
  * @method void setUrlHash(string $value)
+ * @method string getLocation()
+ * @method void setLocation(string $value)
  * @method string getUrl()
  * @method string getTitle()
  * @method void setTitle(string $value)
@@ -63,6 +65,7 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
     protected $articlesPerUpdate;
     protected $lastModified;
     protected $etag;
+    protected $location;
 
     public function __construct(){
         $this->addType('parentId', 'integer');
diff --git a/js/bower.json b/js/bower.json
index c8e68b32b..ac1b003bb 100644
--- a/js/bower.json
+++ b/js/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "ownCloud-news",
-    "version": "4.0.1",
+    "version": "4.0.0",
     "homepage": "https://github.com/owncloud/news",
     "authors": [
         "Bernhard Posselt <dev@bernhard-posselt.com>"
diff --git a/js/package.json b/js/package.json
index 47211d926..029d2901a 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ownCloud-news",
-    "version": "4.0.1",
+    "version": "4.0.0",
     "description": "An RSS/Atom feed reader",
     "main": "build/app.js",
     "scripts": {