Prepare for the 0.5.3 release

qmk · Jul 8, 2017 · 1c435cb · 1c435cb
1 parent 35911c4
commit 1c435cb
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 2 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,15 @@
+# Code Of Conduct
+
+QMK strives to be an inclusive and tolerant community. We welcome participation from anyone regardless of age, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, political belief, race, religion, or sexual identity and orientation. 
+
+> “A gentle word turns away wrath, but a harsh word stirs up anger.”
+
+Our users, contributors, and collaborators are expected to treat each other with respect, to assume good intentions, and to gently correct, where possible, rather than react with escalation. Some examples of behavior we will not tolerate include, but is not limited to:
+
+* The use of sexualized language or imagery
+* Unwelcome advances, sexual or otherwise
+* Insults or derogatory comments, or personal or political attacks
+* Publishing others’ private information without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+If someone is violating this Code of Conduct you may email hello@qmk.fm to bring your concern to the Members. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. 
diff --git a/book.json b/book.json
@@ -0,0 +1,39 @@
+{
+    "structure": {
+        "summary": "_summary.md"
+    },
+    "plugins" : [
+      "anchors",
+      "edit-link",
+      "forkmegithub",
+      "git-author",
+      "hints",
+      "numbered-headings",
+      "page-toc",
+      "terminal",
+      "toolbar"
+    ],
+    "pluginsConfig": {
+      "edit-link": {
+        "base": "https://github.com/qmk/qmk_flasher/edit/master/docs",
+        "label": "Suggest an edit"
+      },
+      "forkmegithub": {
+        "color": "red",
+        "url": "https://github.com/qmk/qmk_flasher"
+      },
+      "page-toc": {
+        "selector": ".markdown-section h1, .markdown-section h2"
+      },
+      "toolbar": {
+        "buttons": [
+          {
+            "label": "QMK Flasher",
+            "icon": "fa fa-github",
+            "url": "https://github.com/qmk/qmk_flasher"
+          }
+        ]
+      }
+    },
+    "root": "./docs/"
+}
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1 @@
+This is the placeholder page for QMK Flasher documentation.
diff --git a/docs/_summary.md b/docs/_summary.md
@@ -0,0 +1 @@
+* [Getting started](README.md) 
diff --git a/docs/gitbook/images/favicon.ico b/docs/gitbook/images/favicon.ico
diff --git a/docs/gitbook/images/favicon.png b/docs/gitbook/images/favicon.png
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "qmk-flasher",
   "productName": "QMK Flasher",
-  "version": "0.5.2",
+  "version": "0.5.3rc1",
   "description": "GUI app to load firmware onto QMK Keyboards.",
   "main": "src/main.js",
   "scripts": {

diff --git a/qmk_flasher.win32.nsi b/qmk_flasher.win32.nsi
@@ -8,7 +8,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 5
-!define VERSIONBUILD 2
+!define VERSIONBUILD 3rc1
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/qmk/qmk_flasher/issues" # "Support Information" link
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This is the placeholder page for QMK Flasher documentation.