4 Commits
1.0.5 ... 1.0.6

Author SHA1 Message Date
gitea
52d16cfee5 [no ci] release 1.0.6 2025-02-12 04:55:31 +00:00
e23592b6a4 moves git tag before snapshot
All checks were successful
CI / deploy (push) Successful in 8m36s
2025-02-12 05:46:56 +01:00
a166eecd60 Merge pull request 'removes redundant rejoin button' (#28) from redesign into main
Some checks failed
CI / deploy (push) Has been cancelled
Reviewed-on: #28
2025-02-12 05:44:40 +01:00
4b8b2ce5f3 removes redundant rejoin button
Some checks failed
CI / deploy (push) Has been cancelled
CI / deploy (pull_request) Has been cancelled
2025-02-12 05:43:19 +01:00
3 changed files with 5 additions and 15 deletions

View File

@@ -62,9 +62,9 @@ jobs:
git config user.name "gitea" git config user.name "gitea"
git add ./pom.xml git add ./pom.xml
git commit -m "[no ci] release ${{ steps.version.outputs.VERSION }}" git commit -m "[no ci] release ${{ steps.version.outputs.VERSION }}"
git tag ${{ steps.version.outputs.VERSION }} -m "release ${{ steps.version.outputs.VERSION }}"
./mvnw -B --no-transfer-progress clean validate -Pnew-snapshot ./mvnw -B --no-transfer-progress clean validate -Pnew-snapshot
git add ./pom.xml git add ./pom.xml
git commit -m "[no ci] prepare new Version" git commit -m "[no ci] prepare new Version"
git tag ${{ steps.version.outputs.VERSION }} -m "release ${{ steps.version.outputs.VERSION }}"
git push origin main git push origin main
git push origin ${{ steps.version.outputs.VERSION }} git push origin ${{ steps.version.outputs.VERSION }}

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.arindy</groupId> <groupId>de.arindy</groupId>
<artifactId>dice-tower</artifactId> <artifactId>dice-tower</artifactId>
<version>1.0.6-SNAPSHOT</version> <version>1.0.6</version>
<properties> <properties>
<compiler-plugin.version>3.13.0</compiler-plugin.version> <compiler-plugin.version>3.13.0</compiler-plugin.version>

View File

@@ -524,19 +524,9 @@
} }
if (localStorage.getItem('last-name') && localStorage.getItem('last-room')) { if (localStorage.getItem('last-name') && localStorage.getItem('last-room')) {
let rejoin = document.createElement('button');
rejoin.id = 'rejoin';
rejoin.style.alignSelf = 'center';
rejoin.style.marginTop = '20px';
rejoin.style.marginRight = '20px';
rejoin.innerHTML = 'Rejoin as <strong>' + (localStorage.getItem('last-gm') === 'true' ? 'GM ' : '') + localStorage.getItem('last-name') + '</strong> in <strong>' + localStorage.getItem('last-room') + '</strong> <i class="fa-solid fa-right-to-bracket"></i>'
rejoin.onclick = () => {
document.getElementById('name').value = localStorage.getItem('last-name'); document.getElementById('name').value = localStorage.getItem('last-name');
document.getElementById('room').value = localStorage.getItem('last-room'); document.getElementById('room').value = localStorage.getItem('last-room');
document.getElementById('gm').checked = localStorage.getItem('last-gm') === 'true'; document.getElementById('gm').checked = localStorage.getItem('last-gm') === 'true';
start();
}
document.getElementById('start-container').appendChild(rejoin)
} }
function configurePopover() { function configurePopover() {