Merge branch '18.02' into persona-fallback

edegeyer · Jun 6, 2018 · 9c2f08f · 9c2f08f
2 parents be3b38e + 23d1a3e
commit 9c2f08f
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 17 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
@@ -97,6 +100,15 @@
 [submodule "mycroft-speak"]
 	path = skill-speak
 	url = https://github.com/mycroftai/skill-speak.git
-[submodule "fallback-persona"]
-	path = fallback-persona
-	url = https://github.com/MycroftAI/skill-fallback-persona.git
+[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
diff --git a/DEFAULT-SKILLS b/DEFAULT-SKILLS
@@ -26,7 +26,7 @@ mycroft-singing
 mycroft-spelling
 mycroft-stock
 mycroft-support-helper
-#mycroft-timer
+mycroft-timer
 mycroft-weather
 mycroft-wiki
 mycroft-version-checker
diff --git a/README.md b/README.md
@@ -142,3 +142,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:  | [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-duck-duck-go b/fallback-duck-duck-go
diff --git a/mycroft-timer b/mycroft-timer
diff --git a/pandora-skill b/pandora-skill
diff --git a/plasma-activities-skill b/plasma-activities-skill
diff --git a/skill-alarm b/skill-alarm
diff --git a/skill-configuration b/skill-configuration
diff --git a/skill-installer b/skill-installer
diff --git a/skill-naptime b/skill-naptime
diff --git a/skill-release-test b/skill-release-test
diff --git a/skill-reminder b/skill-reminder
diff --git a/skill-support b/skill-support
diff --git a/skill-version-checker b/skill-version-checker
diff --git a/skill-volume b/skill-volume
diff --git a/spotify-skill b/spotify-skill
diff --git a/translate-skill b/translate-skill
+1 −1		test/intent/sample1.intent.json
+1 −1		test/intent/sample2.intent.json
+2 −0		dialog/es-es/config.no_change.dialog
+2 −0		dialog/es-es/config.not.paired.dialog
+3 −0		dialog/es-es/config.updated.dialog
+1 −0		dialog/es-es/download.started.dialog
+2 −0		dialog/es-es/get.listener.dialog
+2 −0		dialog/es-es/i.am.at.dialog
+1 −0		dialog/es-es/listener.same.dialog
+2 −0		dialog/es-es/model.is.dialog
+1 −0		dialog/es-es/models.not.found.dialog
+1 −0		dialog/es-es/models.updated.dialog
+1 −0		dialog/es-es/must.be.hey.mycroft.dialog
+1 −0		dialog/es-es/must.update.dialog
+2 −0		dialog/es-es/my.name.is.dialog
+1 −0		dialog/es-es/not.precise.dialog
+1 −0		dialog/es-es/set.listener.dialog
+4 −0		vocab/es-es/ConfigurationSkillKeyword.voc
+6 −0		vocab/es-es/ConfigurationSkillUpdateVerb.voc
+6 −0		vocab/es-es/DeviceLocation.voc
+6 −0		vocab/es-es/GetKeyword.voc
+6 −0		vocab/es-es/ListenerKeyword.voc
+5 −0		vocab/es-es/ListenerType.voc
+1 −0		vocab/es-es/Name.voc
+7 −0		vocab/es-es/PreciseKeyword.voc
+8 −0		vocab/es-es/SetKeyword.voc
+2 −0		vocab/es-es/Using.voc
+7 −0		vocab/es-es/What.voc
+6 −0		vocab/es-es/WhereAreYou.voc
+10 −1		__init__.py
+2 −0		dialog/en-us/ask.upgrade.dialog
+2 −0		dialog/en-us/upgrade.cancelled.dialog
+2 −0		dialog/en-us/upgrade.started.dialog
+4 −0		dialog/en-us/yes.list
+1 −1		__init__.py
+0 −0		requirements.sh
+6 −4		test/__init__.py