diff --git a/.gitignore b/.gitignore index 8f12ba49..827910e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ -**.js -!vendor/**/*.js -**.js.map -**.css.map -**.css -!vendor/**/*.css - generated/ node_modules/ auth/certs/ diff --git a/.travis.yml b/.travis.yml index 0a6bf289..a4653a9c 100644 --- a/.travis.yml +++ b/.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 \ No newline at end of file + - "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 \ No newline at end of file diff --git a/shared/.gitignore b/shared/.gitignore index 0e6e3397..0c90c86e 100644 --- a/shared/.gitignore +++ b/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 diff --git a/shared/html/templates.html b/shared/html/templates.html index dbc34cdb..76903b09 100644 --- a/shared/html/templates.html +++ b/shared/html/templates.html @@ -2246,16 +2246,7 @@
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"); diff --git a/tools/dtsgen/.gitignore b/tools/dtsgen/.gitignore index e69de29b..20efd1ec 100644 --- a/tools/dtsgen/.gitignore +++ b/tools/dtsgen/.gitignore @@ -0,0 +1,2 @@ +**/*.js +**/*.js.map \ No newline at end of file diff --git a/vendor/bbcode b/vendor/bbcode index 23f9aca6..9a1c31f2 160000 --- a/vendor/bbcode +++ b/vendor/bbcode @@ -1 +1 @@ -Subproject commit 23f9aca6b6dc1ffccd20d6da04953776a1882f2b +Subproject commit 9a1c31f27fcac129fa3503c2c1d2096c126d3fd2