From 948af10c558a3b3a56f168f32669a6ba6b076811 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Mon, 16 Jan 2017 14:50:08 +0100
Subject: [PATCH] add Changelog.md and increment to 1.5.0

---
 CHANGELOG.md     | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile         |  2 ++
 appinfo/info.xml |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..d230f1fce
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,61 @@
+## 1.5.0 - 2017-01-17
+### Added
+- enable calendar when selecting it in editor
+  [#24](https://github.com/nextcloud/calendar/issues/24)
+- autoresize input for title, description and location
+  [#72](https://github.com/nextcloud/calendar/issues/72)
+- disable all-day when clicking on time-input
+  [#72](https://github.com/nextcloud/calendar/issues/72)
+- save 301 responses from webcal subscriptions
+  [#42](https://github.com/nextcloud/calendar/issues/42)
+- add web-based protocol handlers for WebCAL
+  [#41](https://github.com/nextcloud/calendar/issues/41)
+- better tabindex for event editors
+  [#25](https://github.com/nextcloud/calendar/issues/25)
+- lazy load timezones when rendering events
+  [#14](https://github.com/nextcloud/calendar/issues/14)
+- hide sidepanel on print view
+- replace TRIGGER:P with TRIGGER:P0D
+  [#251](https://github.com/nextcloud/calendar/issues/251)
+
+### Fixed
+- Require sharing api for creating new shares
+  [#205](https://github.com/nextcloud/calendar/issues/205)
+- Importing empty calendars
+  [#194](https://github.com/nextcloud/calendar/issues/194)
+- List app in office category
+- fix sending the RSVP parameter for attendees
+  [#102](https://github.com/nextcloud/calendar/issues/102)
+- fix styling issue with too long group names / too long translations
+  [#99](https://github.com/nextcloud/calendar/issues/99)
+- fix capitalization of Settings & import
+- fix icon share padding
+- fix glitchy looking whitespace in event details
+  [#242](https://github.com/nextcloud/calendar/issues/242)
+
+## 1.4.1 - 2016-11-22
+### Fixed
+- more consistent styles with Nextcloud
+- fixed scrolling of calendar-list
+- added details tab in sidebar
+- improved ARIA support
+- publishing calendars (requires Nextcloud 11)
+- removed eventLimit, all events will be displayed in month view
+- better border styles for calendar grid to enhance usability
+- fixed drag and drop between grid and allday area
+- fixed issue that prevented users from creating events in UTC
+- fixed issue with expanding repeating events on first day of week
+- expand settings area on first run
+- sanitize malformed dates, fixes compatibility with FB birthday webcal
+- attendee: show email address when user has multiple email addresses
+
+## 1.4.0 - 2016-09-19
+### Added
+- WebCal
+- Random color picker
+- Display week numbers
+
+### Fixed
+- Delete alarms from events
+- Adjusted colors to Nextcloud
+- Properly display line breaks in agenda views
diff --git a/Makefile b/Makefile
index 1d3bc819c..0c373b707 100644
--- a/Makefile
+++ b/Makefile
@@ -156,6 +156,8 @@ appstore:
 	"js/vendor/fullcalendar/dist/locale-all.js" \
 	"js/vendor/davclient.js/lib/client.js" \
 	"js/vendor/hsl_rgb_converter/converter.js" \
+	"COPYING" \
+	"CHANGELOG.md" \
 	$(appstore_build_directory)
 ifdef CAN_SIGN
 	mv $(configdir)/config.php $(configdir)/config-2.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 18815a8aa..6400c20ad 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
 	<description><![CDATA[The Nextcloud calendar app is a user interface for Nextcloud's CalDAV server.
 
 It integrates with other apps, allows you to manage calendars and events, display external calendars and invite attendees to your events]]></description>
-	<version>1.4.1</version>
+	<version>1.5.0</version>
 	<licence>AGPL</licence>
 	<namespace>Calendar</namespace>
 	<author homepage="https://georg.coffee">Georg Ehrke</author>