Skip to content

Commit

Permalink
Merge branch 'v24' of https://github.com/jflamy/owlcms4.git into v24
Browse files Browse the repository at this point in the history
  • Loading branch information
jflamy committed Sep 23, 2023
2 parents cb0dc81 + 0cd8e2d commit 2c9e769
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
> Version 44 is a technical migration release. It updates the code to the current version of the user interface framework ([Vaadin 24](http://vaadin.com)). A significant clean-up of the code was performed at the same time, and several annoyances were fixed as a result.
>
**44.0.0-beta14**
**44.0.0-beta15**

- Flags: The scoreboards and medal boards now handle both short and long team names correctly. The flag is positioned at the left of the cell, and the name is centered. For 3-letter acronyms, making the team column narrow works well.
- Fix: the attempt board would not clear the record indicators when switching to another athlete. The color of the new record was also wrong.
- Fix: the athlete card validation was over-zealous, and signaled errors on cells that should not have been validated.
- Flags: The scoreboards and medal boards now handle both short and long team names. The flag is positioned at the left of the cell. For 3-letter acronyms, making the team column narrow works well.
- Fix: the public scoreboard now correctly switches to medals when the announcer starts the medal ceremony. The medal board inherits the team width and other styling parameters from the public scoreboard.
- Known issues: see this [list of known defects](https://github.com/jflamy/owlcms4/issues/734)

Expand Down
2 changes: 1 addition & 1 deletion docs/DigitalOcean.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export RESULTS=results.owlcms.mywire.org
2. This step fetches the configuration and substitutes the values for OFFICIALS and RESULTS before applying it.

```powershell
curl -sfL https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta14/k3s_setup.yaml | envsubst | kubectl apply -f -
curl -sfL https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta15/k3s_setup.yaml | envsubst | kubectl apply -f -
```

> Note: you may have to execute the command several times, because some steps take time to complete. There is no harm done repeating the steps. Wait 30 seconds or so between each attempt, every attempt will get further down the steps. This is simpler than breaking down the setup in several steps.
Expand Down
2 changes: 1 addition & 1 deletion docs/DockerDesktop.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Docker Desktop installs the `kubectl` utility that is used to control Kubernetes
This step installs owlcms and its prerequisites into the Kubernetes cluster. It does NOT configure the internet access, this is done in the later steps.

```powershell
kubectl apply -f https://github.com/owlcms/owlcms4/releases/44.0.0-beta14/download/dd_setup.yaml
kubectl apply -f https://github.com/owlcms/owlcms4/releases/44.0.0-beta15/download/dd_setup.yaml
```

## Link the cluster to KubeSail
Expand Down
4 changes: 2 additions & 2 deletions docs/Downloads.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Several options are available for installation, depending on your needs. Additio

| | |
| ------------------------------------------------------------ | ------------------------------------------------------------ |
| **Local Setup** <br />This installs the `owlcms` program to run a competition locally, on a master laptop. No internet connection is needed.<ul><li>[Windows Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/LocalWindowsSetup)<li>[Mac/Linux Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/LocalLinuxMacSetup)<li><nobr>[Release Notes](https://github.com/owlcms/owlcms4-prerelease/releases/tag/44.0.0-beta14)</nobr></ul> | <nobr><i class="material-icons" style="transform: translatey(0.30em)">file_download</i> **[Windows Installer](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta14/owlcms_setup_44.0.0-beta14.exe)**</nobr><br/><i class="material-icons" style="transform: translatey(0.30em)">file_download</i>[Mac/Linux Zip](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta14/owlcms_44.0.0-beta14.zip) |
| **Cloud-based Setup**<br />This installs the `owlcms` competition management software in the cloud. Good internet access is needed but no local software is needed. The `publicresults` companion program allows individuals to see the scoreboard on their own phone or tablet no matter where they are located.<ul><li>[Fly.io Cloud Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/Fly)</li><li><nobr>[Release Notes](https://github.com/owlcms/owlcms4-prerelease/releases/tag/44.0.0-beta14)</nobr></li></ul> | |
| **Local Setup** <br />This installs the `owlcms` program to run a competition locally, on a master laptop. No internet connection is needed.<ul><li>[Windows Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/LocalWindowsSetup)<li>[Mac/Linux Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/LocalLinuxMacSetup)<li><nobr>[Release Notes](https://github.com/owlcms/owlcms4-prerelease/releases/tag/44.0.0-beta15)</nobr></ul> | <nobr><i class="material-icons" style="transform: translatey(0.30em)">file_download</i> **[Windows Installer](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta15/owlcms_setup_44.0.0-beta15.exe)**</nobr><br/><i class="material-icons" style="transform: translatey(0.30em)">file_download</i>[Mac/Linux Zip](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta15/owlcms_44.0.0-beta15.zip) |
| **Cloud-based Setup**<br />This installs the `owlcms` competition management software in the cloud. Good internet access is needed but no local software is needed. The `publicresults` companion program allows individuals to see the scoreboard on their own phone or tablet no matter where they are located.<ul><li>[Fly.io Cloud Installation Instructions](https://owlcms.github.io/owlcms4-prerelease/#/Fly)</li><li><nobr>[Release Notes](https://github.com/owlcms/owlcms4-prerelease/releases/tag/44.0.0-beta15)</nobr></li></ul> | |
| **Documentation** | [Documentation site](https://owlcms.github.io/owlcms4-prerelease/#/index) |

Note: the table above matches the repository you are looking at. If you are looking at the stable release documentation, the links will take you to stable releases, and if you are looking at the prerelease documentation, the links will take you to the preliminary release. If you need the other kind, please use the following links:
Expand Down
2 changes: 1 addition & 1 deletion docs/Heroku.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ heroku login
heroku plugins:install java
```

- Get a current release [zip](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta14/owlcms_44.0.0-beta14.zip) from the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases)
- Get a current release [zip](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta15/owlcms_44.0.0-beta15.zip) from the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases)
- Unzip file to your desired installation location and change directory (`cd`) to that location
- Run the following commands. Replace `myclub` with you own application name.

Expand Down
2 changes: 1 addition & 1 deletion docs/LocalLinuxMacSetup.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## macOS or Linux Installation

- **Get the installation zip archive**: Get the current [`owlcms_44.0.0-beta14.zip`](https://github.com/owlcms/owlcms4-prerelease/releases/latest/download/owlcms_44.0.0-beta14.zip) file (located in the `assets` section at the bottom of each release in the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases/latest) .
- **Get the installation zip archive**: Get the current [`owlcms_44.0.0-beta15.zip`](https://github.com/owlcms/owlcms4-prerelease/releases/latest/download/owlcms_44.0.0-beta15.zip) file (located in the `assets` section at the bottom of each release in the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases/latest) .

- Double-click on the downloaded zip file, and extract the files to a directory.

Expand Down
2 changes: 1 addition & 1 deletion docs/LocalWindowsSetup.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Windows Installation

- **Windows Installer** : Get the current [`owlcms_setup_44.0.0-beta14.exe`](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta14/owlcms_setup_44.0.0-beta14.exe) file (located in the `assets` section at the bottom of each release in the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases/latest) ).
- **Windows Installer** : Get the current [`owlcms_setup_44.0.0-beta15.exe`](https://github.com/owlcms/owlcms4-prerelease/releases/download/44.0.0-beta15/owlcms_setup_44.0.0-beta15.exe) file (located in the `assets` section at the bottom of each release in the [release repository](https://github.com/owlcms/owlcms4-prerelease/releases/latest) ).

![zip](img\LocalInstall\010_setupexe.png)

Expand Down
2 changes: 1 addition & 1 deletion docs/k3d.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export RESULTS=results.owlcms.youraccount.usw1.k8g8.com
2. This step fetches the configuration and substitutes the values for OFFICIALS and RESULTS before applying it.

```powershell
curl -sfL https://github.com/owlcms/owlcms4/releases/download/44.0.0-beta14/k3d_setup.yaml | envsubst | kubectl apply -f -
curl -sfL https://github.com/owlcms/owlcms4/releases/download/44.0.0-beta15/k3d_setup.yaml | envsubst | kubectl apply -f -
```

> Note: you may have to execute the command several times, because some steps take time to complete. There is no harm done repeating the steps. Wait 30 seconds or so between each attempt, every attempt will get further down the steps. This is simpler than breaking down the setup in several steps.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<properties>
<!-- revision is overridden by azure-pipelines.yml for the official builds. this value is only used for local development -->
<revision>44.0.0-beta14</revision>
<revision>44.0.0-beta15</revision>
<owlcms-maven-url>http://maven.lerta.ca:8880</owlcms-maven-url>
<owlcms-maven-suffix>/releases</owlcms-maven-suffix> <!-- /snapshots if revision is -SNAPSHOT -->
<owlcms-docker>docker.io/owlcms</owlcms-docker>
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
44.0.0-beta14
44.0.0-beta15

0 comments on commit 2c9e769

Please sign in to comment.