Merge remote-tracking branch 'origin/master'

.gitignore

@@ -1,10 +1,3 @@
-**.js
-!vendor/**/*.js
-**.js.map
-**.css.map
-**.css
-!vendor/**/*.css
-
 generated/
 node_modules/
 auth/certs/

.travis.yml

@@ -20,10 +20,11 @@ jobs:
         - "ls -lah /tmp/build/"
         - "ls -lah /tmp/build/logs/"
         - "ls -lah /tmp/build/packages/"
-        - "wget https://github.com/buildkite/github-release/releases/download/v1.0/github-release-linux-amd64 -O /tmp/git-release; chmod +x /tmp/git-release;"
-        - "echo \"Release commit: $COMMIT\"; export GITHUB_RELEASE_COMMIT=\"$COMMIT\""
-        - "export GITHUB_RELEASE_TAG=\"This is a auto build release from travis\""
-        - "export GITHUB_RELEASE_REPOSITORY=\"$REPO_FULL_NAME\""
-        - "export GITHUB_RELEASE_ACCESS_TOKEN=\"$GIT_AUTHTOKEN\""
-        - "/tmp/git-release \"Travis autobuild $COMMIT\" /tmp/build/packages/* /tmp/build/logs/*"
-      if: branch = master && is_fork = false
+        - "wget https://github.com/buildkite/github-release/releases/download/v1.0/github-release-linux-amd64 -O /tmp/git-release -q; chmod +x /tmp/git-release;"
+        - >
+          export GITHUB_RELEASE_TAG="This is a auto build release from travis";
+          export GITHUB_RELEASE_REPOSITORY="$TRAVIS_REPO_SLUG";
+          export GITHUB_RELEASE_ACCESS_TOKEN="$GIT_AUTHTOKEN";
+          echo "Release commit: $TRAVIS_COMMIT"; export GITHUB_RELEASE_COMMIT="$TRAVIS_COMMIT";
+          /tmp/git-release "Travis autobuild $TRAVIS_COMMIT" /tmp/build/packages/* /tmp/build/logs/*;
+      if: branch = master

shared/.gitignore

@@ -2,8 +2,8 @@
 declarations/*.d.ts
 
 #Ignore the generated mapped files
-css/theme/**/*.css
-css/theme/**/*.css.map
+css/static/**/*.css
+css/static/**/*.css.map
 
 js/**/*.js
 js/**/*.js.map

shared/html/templates.html

@@ -2246,16 +2246,7 @@
 
                     <div style="
                         background:center no-repeat url(
-                                    {{:property_virtualserver_hostbanner_gfx_url}}
-                                    {{if property_virtualserver_hostbanner_gfx_interval > 0}}
-                                        {{*
-                                            date = Math.floor(Date.now() / 1000);
-                                            if (data.property_virtualserver_hostbanner_gfx_interval <= 60)
-                                                data.property_virtualserver_hostbanner_gfx_interval = 60;
-                                            date = Math.floor(date / data.property_virtualserver_hostbanner_gfx_interval) * data.property_virtualserver_hostbanner_gfx_interval;
-                                        }}
-                                        ?ts={{*:date}}
-                                    {{/if}}
+                                    {{:property_virtualserver_hostbanner_gfx_url}}{{:cache_tag}}
                         );
 
                         background-position: center;

shared/js/ui/frames/ControlBar.ts

@@ -12,8 +12,6 @@
         client_away Value: '0'
         client_away_message Value: ''
  */
-import openBanList = Modals.openBanList;
-import spawnConnectModal = Modals.spawnConnectModal;
 
 class ControlBar {
     private _muteInput: boolean;
@@ -303,7 +301,7 @@ class ControlBar {
         if(!this.handle.serverConnection) return;
 
         if(this.handle.permissions.neededPermission(PermissionType.B_CLIENT_BAN_LIST).granted(1)) {
-            openBanList(this.handle);
+            Modals.openBanList(this.handle);
         } else {
             createErrorModal(tr("You dont have the permission"), tr("You dont have the permission to view the ban list")).open();
             sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS);

shared/js/ui/frames/SelectedItemInfo.ts

@@ -159,12 +159,28 @@ class Hostbanner {
         for(let key in server.properties)
             properties["property_" + key] = server.properties[key];
 
+        if(server.properties.virtualserver_hostbanner_gfx_interval > 0) {
+            const update_interval = Math.min(server.properties.virtualserver_hostbanner_gfx_interval, 60);
+            const update_timestamp = (Math.floor((Date.now() / 1000) / update_interval) * update_interval).toString();
+            try {
+                const url = new URL(server.properties.virtualserver_hostbanner_gfx_url);
+                if(url.search.length == 0)
+                    properties["cache_tag"] = "?_ts=" + update_timestamp;
+                else
+                    properties["cache_tag"] = "&_ts=" + update_timestamp;
+            } catch(error) {
+                console.warn(tr("Failed to parse banner URL: %o"), error);
+                properties["cache_tag"] = "&_ts=" + update_timestamp;
+            }
+
+            this.updater = setTimeout(() => this.update(), update_interval * 1000);
+        } else {
+            properties["cache_tag"] = "";
+        }
+
+
         const rendered = $("#tmpl_selected_hostbanner").renderTag(properties);
-
         console.debug(tr("Hostbanner has been loaded"));
-        if(server.properties.virtualserver_hostbanner_gfx_interval > 0)
-            this.updater = setTimeout(() => this.update(), Math.min(server.properties.virtualserver_hostbanner_gfx_interval, 60) * 1000);
-
         return Promise.resolve(rendered);
         /*
         const image = rendered.find("img");

tools/dtsgen/.gitignore

@@ -0,0 +1,2 @@
+**/*.js
+**/*.js.map

vendor/bbcode

@@ -1 +1 @@
-Subproject commit 23f9aca6b6dc1ffccd20d6da04953776a1882f2b
+Subproject commit 9a1c31f27fcac129fa3503c2c1d2096c126d3fd2