Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Added nightly footer

Browse Source
This commit is contained in:
DerLinkman 2022-08-24 14:31:32 +02:00
parent b16b276f36
commit a8eb3b6ac5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/web/templates/base.twig
View File

@ -477,13 +477,20 @@ function recursiveBase64StrToArrayBuffer(obj) {
{% if ui_texts.ui_footer %} {% if ui_texts.ui_footer %}
<hr><span class="rot-enc">{{ ui_texts.ui_footer|rot13|raw }}</span> <hr><span class="rot-enc">{{ ui_texts.ui_footer|rot13|raw }}</span>
{% endif %} {% endif %}
{% if mailcow_cc_username and mailcow_info.version_tag|default %} {% if mailcow_cc_username and mailcow_info.mailcow_build|lower == "stable" and mailcow_info.version_tag|default %}
<span class="version"> <span class="version">
🐮 + 🐋 = 💕 🐮 + 🐋 = 💕
<a href="{{ mailcow_info.git_project_url }}/releases/tag/{{ mailcow_info.version_tag }}" target="_blank"> Version: <a href="{{ mailcow_info.git_project_url }}/releases/tag/{{ mailcow_info.version_tag }}" target="_blank">{{ mailcow_info.version_tag }}
Version: {{ mailcow_info.version_tag }}
</a> </a>
</span> </span>
{% endif %}
{% if mailcow_cc_username and mailcow_info.mailcow_build|lower == "nightly" and mailcow_info.version_tag|default %}
<span class="version">
🛠️🐮 + 🐋 = 💕
Nightly: <a href="{{ mailcow_info.git_project_url }}/commit/{{ mailcow_info.git_commit }}" target="_blank">{{ mailcow_info.version_tag }}
</a><br>
<span style="text-align:right;display:block;">Build: {{ mailcow_info.git_commit_date }}</span>
</span>
{% endif %} {% endif %}
</div> </div>
</body> </body>

3
update.sh
View File

@ -873,11 +873,12 @@ fi
# Set app_info.inc.php # Set app_info.inc.php
if [ ${BRANCH} == "master" ]; then if [ ${BRANCH} == "master" ]; then
mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`) mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
mailcow_last_git_version=""
elif [ ${BRANCH} == "nightly" ]; then elif [ ${BRANCH} == "nightly" ]; then
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_git_version=$(git rev-parse --short HEAD)
mailcow_last_git_version=""
else else
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_git_version=$(git rev-parse --short HEAD)
mailcow_last_git_version=""
fi fi
mailcow_git_commit=$(git rev-parse HEAD) mailcow_git_commit=$(git rev-parse HEAD)