Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge recent changes #11

Merged
merged 9 commits into from
Dec 28, 2023
Merged
12 changes: 8 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Build the Docker image
- uses: actions/checkout@v4
- name: Build the Docker image for temporary use only
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
run: docker build . --file Dockerfile --tag tmp:latest
- name: Build the Docker image for tag release
if: startsWith(github.ref, 'refs/tags/')
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_IMAGE_NAME }}:latest
- name: Docker Login
if: startsWith(github.ref, 'refs/tags/')
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -33,4 +37,4 @@ jobs:
uses: WSE-research/[email protected]
with:
updater_host: ${{ secrets.UPDATER_HOST }}
api_key: ${{ secrets.API_KEY }}
api_key: ${{ secrets.API_KEY }}
2 changes: 1 addition & 1 deletion image-to-ascii-art-converter-web-ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ def save_current_configuration(data, absolute_filename):

st.markdown("""
---
Brought to you by the [<img style="height:3ex;border:0" src="https://avatars.githubusercontent.com/u/120292474?s=96&v=4"> WSE research group](http://wse.technology/) at the [Leipzig University of Applied Sciences](https://www.htwk-leipzig.de/).
Brought to you by the [<img style="height:3ex;border:0" src="https://avatars.githubusercontent.com/u/120292474?s=96&v=4"> WSE research group](https://wse-research.org/?utm_source=image-to-ascii-art&utm_medium=footer) at the [Leipzig University of Applied Sciences](https://www.htwk-leipzig.de/).

See our [GitHub team page](http://wse.technology/) for more projects and tools.
""", unsafe_allow_html=True)
Expand Down
2 changes: 1 addition & 1 deletion js/change_menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ waitForElm('#MainMenu').then((elm) => {
if (parent.window.document.getElementById("WSElogo") == null) {
let new_logo = parent.window.document.getElementById("MainMenu").parentElement.appendChild(parent.window.document.createElement("span"));
new_logo.innerHTML = `
<a href="http://wse.technology?utm_source=menu" title="Brought to you by the WSE research group at the Leipzig University of Applied Sciences. See our GitHub team page for more projects and tools." target="_blank">
<a href="https://wse-research.org/?utm_source=image-to-ascii-art&utm_medium=header" title="Brought to you by the WSE research group at the Leipzig University of Applied Sciences. See our GitHub team page for more projects and tools." target="_blank">
<img id="WSElogo" src='https://avatars.githubusercontent.com/u/120292474?s=96&v=4'>
</a>
`;
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ansi2html==1.8.0
ansi2html==1.9.1
ansitoimg==2023.1
ascii_magic==2.3.0
lxml==4.9.2
markdown==3.4.4
lxml==4.9.4
markdown==3.5.1
Pillow==9.4.0
python-decouple==3.8
Requests==2.31.0
Expand Down