From 55f772dda43e952c6e5799eecd8c8b95062cf710 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 2 Apr 2019 16:25:27 +0200 Subject: [PATCH 1/3] Prepare for 1.2.0 release --- CHANGELOG.md | 19 +++++++++++++++++++ appinfo/info.xml | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dd76080015..4aa931241b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [1.2.0] + +### Added + +- Add occ command to reset for all users - [#83](https://github.com/owncloud/firstrunwizard/issues/83) + +### Changed + +- Decouple from core, switching to own release cycle + +## [1.1.1] + +### Changed + +- Set max version to 10 + ## [1.1] - 2014-07-07 ### Added @@ -25,3 +41,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added - Initial implementation + +[1.2.0]: https://github.com/owncloud/firstrunwizard/compare/v1.1.1...v1.2.0 +[1.1.1]: https://github.com/owncloud/firstrunwizard/compare/v1.1...v1.1.1 diff --git a/appinfo/info.xml b/appinfo/info.xml index b0054b10791..f51f1579ade 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,11 +6,11 @@ The First run wizard can be customized to meet specific design goals, or to change links and messages. Create an appropriate theme following the Theming documentation, and changes to the look and feel of this Wizard are simple. More information is available in the First run wizard documentation, as well as the theming documentation. AGPL - Frank Karlitschek, Jan-Christoph Borchardt + Frank Karlitschek, Jan-Christoph Borchardt, Tom Needham - 1.1.1 + 1.2.0 FirstRunWizard From 136a4a4436436aaac50977f95bfb2a510650a8f1 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 2 Apr 2019 16:31:34 +0200 Subject: [PATCH 2/3] Fix Makefile for tar --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d3976b389f4..270e93eaef9 100644 --- a/Makefile +++ b/Makefile @@ -52,10 +52,11 @@ dist: source appstore source: rm -rf $(source_build_directory) mkdir -p $(source_build_directory) - tar cvzf $(source_package_name).tar.gz ../$(app_name) \ + tar --format=gnu --owner=nobody --group=nogroup -cvzf $(source_package_name).tar.gz \ --exclude-vcs \ --exclude="../$(app_name)/build" \ - --exclude="../$(app_name)/*.log" + --exclude="../$(app_name)/*.log" \ + ../$(app_name) # Builds the source package for the app store, ignores php and js tests .PHONY: appstore @@ -76,12 +77,13 @@ appstore: wizard.php \ $(appstore_package_name) + rm -R $(appstore_package_name)/l10n/{.tx,.gitignore} ifdef CAN_SIGN $(sign) --path="$(appstore_package_name)" else @echo $(sign_skip_msg) endif - tar -czf $(appstore_package_name).tar.gz -C $(appstore_package_name)/../ $(app_name) + tar --format=gnu --owner=nobody --group=nogroup -czf $(appstore_package_name).tar.gz -C $(appstore_package_name)/../ $(app_name) ##--------------------- ## Tests From 7e7af2bc1f18f79f5a776ff479235c2c7c6acdcf Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 16 Apr 2019 11:09:27 +0200 Subject: [PATCH 3/3] Update release date for 1.2.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aa931241b2..728a9690b06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). -## [1.2.0] +## [Unreleased] + +## [1.2.0] - 2019-04-16 ### Added @@ -42,5 +44,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Initial implementation +[Unreleased]: https://github.com/owncloud/firstrunwizard/compare/v1.2.0...master [1.2.0]: https://github.com/owncloud/firstrunwizard/compare/v1.1.1...v1.2.0 [1.1.1]: https://github.com/owncloud/firstrunwizard/compare/v1.1...v1.1.1