From c0913cf1e7d31b7324aaec388b527ef9c4010ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20M=C3=BCller?= Date: Sat, 6 Jan 2018 21:16:08 +0100 Subject: [PATCH 1/2] add contributing file and remove from readme --- CONTRIBUTING.md | 7 +++++++ README.md | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..50482ee --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,7 @@ +# Contributing + +First off, thank you for your support to this project :smiley:. If you would like to contribute to this project you are more than welcome! Just open an Issue or a Pull Request with your idea or suggested change. + +Please keep the [Code of Conduct](CODE_OF_CONDUCT.md) in mind while contributing. + +This repo uses the GitFlow branching model. The core concept of the GitFlow methodology is that development happens in the develop branch, but new features and functionality are created in seperate feature branches that are merged into develop when complete. Releases merge develop into master, and you can apply hotfix branches as needed during the release process. ([Grav Development GitHub](https://learn.getgrav.org/advanced/grav-development#github-setup)) diff --git a/README.md b/README.md index a8bc22f..37908c1 100644 --- a/README.md +++ b/README.md @@ -194,12 +194,6 @@ If you want to set pluspunkt as the default theme, you can do so by following th Once this is done, you should be able to see the new theme on the frontend. Keep in mind any customizations made to the previous theme will not be reflected as all of the theme and templating information is now being pulled from the **pluspunkt** folder. -# Contributing - -If you would like to contribute to this project you are more than welcome! Just open an Issue or a Pull Request with your idea or suggested change. - -> [Code of Conduct](CODE_OF_CONDUCT.md) - # License Copyright (C) 2017 Simon Müller From 5ccaabcfa22ff90f15b24aaec31823cdbb304923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20M=C3=BCller?= Date: Sat, 6 Jan 2018 21:19:24 +0100 Subject: [PATCH 2/2] prepare for release --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 513dff4..863a6b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,9 @@ * Breadcrumb overflow handling (wrap) * Correct padding of footer widget * Fix display of publish date + +# v1.0.2 +## 6.01.2018 + +1. [](#new) + * Added CONTRIBUTING.md diff --git a/blueprints.yaml b/blueprints.yaml index 1555b66..76a2adc 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: pluspunkt -version: 1.0.1 +version: 1.0.2 description: A simple, responsive and modern Grav theme built with Kube author: name: Simon Müller diff --git a/package.json b/package.json index f54daf3..94ca6c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grav-theme-pluspunkt", - "version": "1.0.1", + "version": "1.0.2", "description": "A simple, responsive and modern Grav theme built with Kube", "keywords": [ "pluspunkt",