Merge branch '18.02' into 18.02

edegeyer · Jun 6, 2018 · ee316e3 · ee316e3
2 parents 7976ec7 + ea9ca27
commit ee316e3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 4 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
@@ -6,6 +6,7 @@
 ## Checklist:
   - [ ] Used [Meta Editor](http://rawgit.com/MycroftAI/mycroft-skills/master/meta_editor.html) to generate the skill README
   - [ ] Skill has been tested and works
+  - [ ] Read and verified approval process - https://mycroft.ai/documentation/skills/skills-acceptance-process (Can require a community member vouching for skill)
   - [ ] README.md has been updated with the following:
   ```
   +[submodule "NAME OF YOUR SKILL"]

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "fallback-persona"]
+	path = fallback-persona
+	url = https://github.com/MycroftAI/skill-fallback-persona.git
 [submodule "mycroft-stop"]
 	path = skill-stop
 	url = https://github.com/mycroftai/skill-stop
@@ -100,6 +103,15 @@
 [submodule "mycroft-hue"]
 	path = mycroft-hue
 	url = https://github.com/ChristopherRogers1991/mycroft-hue.git
+[submodule "btotharye-home-assistant"]
+	path = btotharye-home-assistant
+	url = https://github.com/btotharye/mycroft-homeassistant
+[submodule "translate-skill"]
+	path = translate-skill
+	url = https://github.com/jcasoft/translate-skill
+[submodule "plasma-activities-skill"]
+	path = plasma-activities-skill
+	url = https://github.com/AIIX/plasma-activities-skill
 [submodule "openhab-mycroft"]
 	path = openhab-mycroft
-	url = https://github.com/openhab/openhab-mycroft
+	url = https://github.com/openhab/openhab-mycroft
diff --git a/README.md b/README.md
@@ -143,4 +143,6 @@ wiki pages.  Also please include the phrase to trigger on as well for your skill
 
 | Status              | Skill Name                                                                      | Description<br>```"phrase to trigger"```    |
 | ------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
-| :heavy_check_mark:  | [mycroft-hue](https://github.com/ChristopherRogers1991/mycroft-hue/blob/master/README.md)| Control your Phillips Hue lights<br>```turn on the lights``` |
+| :heavy_check_mark:  | [Homeassistant](https://github.com/btotharye/mycroft-homeassistant#readme)               | Control your devices in home-assistant<br>```"turn on office"``` |
+| :heavy_check_mark:  | [Plasma Activities Skill](https://github.com/AIIX/plasma-activities-skill#readme)| Control KDE Plasma 5 Activities with Mycroft```show/create/switch/remove activity [name]``` |
+| :heavy_check_mark:  | [translate-skill](https://github.com/jcasoft/translate-skill/tree/84db4da986c1ae165d4c31bb5f907398feb19326#readme)               | Translate phrases into several languages<br>```"translate good morning into japanese"``` |
diff --git a/btotharye-home-assistant b/btotharye-home-assistant
diff --git a/fallback-persona b/fallback-persona
diff --git a/plasma-activities-skill b/plasma-activities-skill
diff --git a/skill-alarm b/skill-alarm
diff --git a/skill-volume b/skill-volume
diff --git a/translate-skill b/translate-skill
+1 −1		test/intent/sample1.intent.json
+1 −1		test/intent/sample2.intent.json