marking correct webui branch

project-alice-assistant · Nov 2, 2021 · d614c45 · d614c45
1 parent 1d98426
commit d614c45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "core/webui/public"]
 	path = core/webui/public
 	url = https://github.com/project-alice-assistant/webui.git
+    branch = master
diff --git a/core/webui/public b/core/webui/public
+6 −1		README.md
+4 −4		src/components/js/admin.js
+2 −2		src/components/js/configInput.js
+36 −36		src/components/js/connect.js
+1 −1		src/components/js/construction.js
+1 −1		src/components/js/deviceOptionsDialog.js
+16 −13		src/components/js/devmode.js
+1 −1		src/components/js/furniture.js
+19 −19		src/components/js/location.js
+17 −0		src/components/js/moveableItem.js
+31 −31		src/components/js/myhome.js
+18 −18		src/components/js/skill.js
+1 −1		src/components/js/skills.js
+5 −5		src/components/js/syslog.js
+1 −1		src/components/js/tabs.js
+11 −11		src/components/js/telemetry.js
+3 −3		src/components/js/widgetOptionsDialog.js
+15 −15		src/components/js/widgets.js
+4 −4		src/components/views/config.vue
+1 −1		src/components/views/configLine.vue
+36 −34		src/components/views/dialogTemplateEditor.vue
+2 −2		src/components/views/fontawesomePromptDialog.vue
+1 −1		src/components/views/gitStatus.vue
+2 −1		src/components/views/simpleJsonEditor.vue
+1 −1		src/components/views/skillSettingsDialog.vue
+2 −2		src/components/views/speechBubble.vue
+31 −29		src/components/views/talkFileEditor.vue
+31 −27		src/components/views/telemetryChart.vue
+39 −39		src/router/index.js
+2 −0		src/utils/audioPlayer.js
+1 −1		src/utils/globalStore.js
+5 −5		src/utils/notifyToast.js