Merge branch 'master' into stable

bugy · Feb 11, 2020 · 515cd27 · 515cd27
2 parents d29a377 + f33c9a9
commit 515cd27
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -53,6 +53,13 @@ deploy:
   skip_cleanup: true
   on:
     branch: master
+- provider: releases
+  name: $(unzip -qc build/script-server.zip version.txt)
+  api_key: "$GITHUB_TOKEN"
+  file: build/script-server.zip
+  skip_cleanup: true
+  on:
+    branch: stable
 - provider: script
   script: tools/deploy_docker.sh
   skip_cleanup: true

diff --git a/web-src/js/admin/AdminApp.vue b/web-src/js/admin/AdminApp.vue
@@ -1,6 +1,9 @@
 <template>
     <div class="admin-page">
         <div class="page-title teal z-depth-1">
+            <a class="btn-flat left home-button" href="index.html">
+                <i class="material-icons white-text">home</i>
+            </a>
             <ul class="tabs tabs-fixed-width" ref="tabs">
                 <li class="tab">
                     <router-link to="/logs">Logs</router-link>
@@ -19,8 +22,8 @@
     import Vue from 'vue';
     import Vuex, {mapActions, mapState} from 'vuex';
     import executions from '../history/executions-module';
-    import scripts from './scripts-config/scripts-module';
     import scriptConfig from './scripts-config/script-config-module';
+    import scripts from './scripts-config/scripts-module';
 
     Vue.use(Vuex);
 
@@ -130,4 +133,15 @@
         flex: 1 1 0;
         overflow-y: auto;
     }
+
+    .home-button {
+        height: 100%;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+
+    .home-button i {
+        font-size: 1.8em;
+        line-height: 1.8em;
+    }
 </style>