Adjust Makefile, Changelog and more

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>

6 files changed, 18 insertions, 16 deletions

diff --git a/AUTHORS.md b/AUTHORS.md
index ced11a335..9018b0118 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -3,6 +3,7 @@
 * [Benjamin Brahmer](mailto:info@b-brahmer.de)
 * [Alessandro Cosentino](mailto:cosenal@gmail.com)
 * [Marco Nassabain](mailto:marco.nassabain@hotmail.com)
+* [Devlin Junker](mailto:devlin.junker@gmail.com)
 * [Robin Appelman](mailto:icewind@owncloud.com)
 * [Sean Molenaar](mailto:sean@seanmolenaar.eu)
 * [Gregor Tätzner](mailto:gregor@freenet.de)
@@ -37,6 +38,8 @@
 * [Thomas Tanghus](mailto:thomas@tanghus.net)
 * [Volkan Gezer](mailto:volkangezer@gmail.com)
 * [Xéfir Destiny](mailto:xefir@crystalyx.net)
+* [devlinjunker](mailto:devlin.junker@gmail.com)
+* [hydrian](mailto:ben.tyger@tygerclan.net)
 * [Daniel Opitz](mailto:danopz@users.noreply.github.com)
 * [Daniel Rheinbay](mailto:danielrheinbay@gmail.com)
 * [Lars Bensmann](mailto:lars@almosthappy.de)
@@ -49,6 +52,7 @@
 * [Christoph Stenglein](mailto:christoph@christophstenglein.com)
 * [Daniel Kesselberg](mailto:mail@danielkesselberg.de)
 * [ELHADDAD Hamza](mailto:elhaddadhamza49@gmail.com)
+* [IgorA100](mailto:igora100@gmail.com)
 * [Jakob Sack](mailto:mail@jakobsack.de)
 * [ManuelSailer](mailto:github.com@manuel-sailer.de)
 * [Qingping Hou](mailto:dave2008713@gmail.com)
@@ -127,10 +131,12 @@
 * [Freddo](mailto:f.falk@protonmail.com)
 * [Freddo3000](mailto:f.falk@protonmail.com)
 * [Greg](mailto:greg@toolstack.com)
+* [HK2FB](mailto:tom.schmidt@helsana.ch)
 * [Hagen](mailto:derhagen@users.noreply.github.com)
 * [Hanzei](mailto:Hanzei@users.noreply.github.com)
 * [Hendrik Leppelsack](mailto:hendrik@leppelsack.de)
 * [Jasper Knockaert](mailto:jasper@knockaert.nl)
+* [Jimmy Boucher](mailto:75694650+jboucher614@users.noreply.github.com)
 * [Kevin Decherf](mailto:kevin@kdecherf.com)
 * [Kuba Orlik](mailto:kontakt@kuba-orlik.name)
 * [Maceček Richard](mailto:46937538+macecekrichard@users.noreply.github.com)
@@ -142,6 +148,7 @@
 * [Michael Grosser](mailto:github@stp-ip.net)
 * [Michael Hamann](mailto:michael@content-space.de)
 * [Michael Holley](mailto:michaelwholley@gmail.com)
+* [Mynacol](mailto:Mynacol@users.noreply.github.com)
 * [NanoSector](mailto:rick@nanosector.nl)
 * [Nick Frey](mailto:nickfrey123@gmail.com)
 * [Oliver Herst](mailto:oliver.herst@googlemail.com)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a31c5f56..3ffe9e455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,11 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 # Unreleased
 ## [25.x.x]
 ### Changed
-- Vue Rewrite
-# Releases
-## [24.x.x]
-### Changed
-- Set User Agent for curl in Scraper
-  
+- Major Rewrite of the Frontend with Vue JS (#748)
+  For comments and suggestions for the new UI, please use this: https://github.com/nextcloud/news/discussions/2388
+- Set User Agent for curl in Scraper (#2380)
+- Drop support for Nextcloud 26, Supported 27
+
 ### Fixed
 
 # Releases
diff --git a/Makefile b/Makefile
index 7029160a6..e4f10f421 100644
--- a/Makefile
+++ b/Makefile
@@ -92,10 +92,10 @@ else
 	@exit 1
 endif
 
-# Removes the appstore build
+# Removes the appstore build and compiled js files
 .PHONY: clean
 clean:
-	rm -rf ./build
+	rm -rf ./build ./js/*
 
 # Reports PHP codestyle violations
 .PHONY: phpcs
@@ -171,9 +171,8 @@ appstore:
 	find $(appstore_sign_dir) -name .htaccess -exec rm {} \;
 
 	# on macOS there is no option "--parents" for the "cp" command
-	mkdir -p $(appstore_sign_dir)/$(app_name)/js/build $(appstore_sign_dir)/$(app_name)/js/admin
-	cp js/build/app.min.js $(appstore_sign_dir)/$(app_name)/js/build
-	cp js/nextcloud-news-admin-settings.js* $(appstore_sign_dir)/$(app_name)/js/build
+	mkdir -p $(appstore_sign_dir)/$(app_name)/js
+	cp js/* $(appstore_sign_dir)/$(app_name)/js/
 
 	# export the key and cert to a file
 	@if [ ! -f $(cert_dir)/$(app_name).key ] || [ ! -f $(cert_dir)/$(app_name).crt ]; then \
diff --git a/README.md b/README.md
index 885f9fb7b..6d3de50e5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
 # Nextcloud News app
-
-**We need help with the frontend, check the issue tracker if you are interested!**
-
 ![Release status](https://github.com/nextcloud/news/workflows/Build%20and%20publish%20app%20release/badge.svg) ![Integration Tests](https://github.com/nextcloud/news/workflows/Integration%20Tests/badge.svg) ![Frontend tests](https://github.com/nextcloud/news/workflows/Frontend%20tests/badge.svg) [![Code coverage](https://img.shields.io/codecov/c/github/nextcloud/news.svg?style=flat)](https://codecov.io/gh/nextcloud/news/)
 
 The News app is an RSS/Atom feed aggregator. It offers a [RESTful API](https://nextcloud.github.io/news/developer/#apis) for app developers. The source code is [available on GitHub](https://github.com/nextcloud/news)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ff7c6e707..10258be04 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
 
 Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     ]]></description>
-    <version>24.0.0</version>
+    <version>25.0.0-alpha1</version>
     <licence>agpl</licence>
     <author>Benjamin Brahmer</author>
     <author>Sean Molenaar</author>
diff --git a/package.json b/package.json
index cddcaf642..352cc50b8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nextcloud-news",
   "description": "An RSS/Atom feed reader",
-  "main": "js/app.min.js",
+  "main": "js/nextcloud-news-main.js",
   "scripts": {
     "prebuild": "npm install && npm ci",
     "build": "NODE_ENV=production webpack --progress --config webpack.js",