Skip to content

Commit 6a0cd42

Browse files
authored
Merge pull request #995 from DJ2LS/develop
2 parents 3bbbbba + e3584a0 commit 6a0cd42

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/prettier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
ref: ${{ github.head_ref }}
1919

2020
- name: Prettify code
21-
uses: creyD/prettier_action@v4.5
21+
uses: creyD/prettier_action@v4.6
2222
with:
2323
# This part is also where you can pass other options, for example:
2424
prettier_options: --write **/*.{js,md,css,html}

freedata_gui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "FreeDATA",
3-
"version": "0.17.5-beta",
3+
"version": "0.17.6-beta",
44
"description": "FreeDATA Client application for connecting to FreeDATA server",
55
"private": true,
66
"scripts": {
@@ -26,7 +26,7 @@
2626
"homepage": "https://freedata.app",
2727
"dependencies": {
2828
"@popperjs/core": "^2.11.8",
29-
"bootstrap": "^5.3.5",
29+
"bootstrap": "^5.3.7",
3030
"bootstrap-icons": "^1.11.3",
3131
"bootstrap-vue-next": "^0.30.0",
3232
"chart.js": "^4.4.3",
@@ -39,7 +39,7 @@
3939
"i18next": "^25.0.2",
4040
"i18next-vue": "^5.2.0",
4141
"js-image-compressor": "^2.0.0",
42-
"marked": "^15.0.3",
42+
"marked": "^16.0.0",
4343
"pinia": "^3.0.1",
4444
"qth-locator": "^2.1.0",
4545
"topojson-client": "^3.1.0",

freedata_gui/src/locales/de_Deutsch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
"attempt": "Versuch",
203203
"utc": "UTC",
204204
"adif": "ADIF",
205-
"new": "neui",
205+
"new": "neu",
206206
"selectChat": "Bitte starte oder wähle einen Chat aus",
207207
"noConversations": "bislang noch kein Chat hier",
208208
"loadingMessages": "Lade Nachrichten..."

freedata_server/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Module for saving some constants
22
CONFIG_ENV_VAR = 'FREEDATA_CONFIG'
33
DEFAULT_CONFIG_FILE = 'config.ini'
4-
MODEM_VERSION = "0.17.5-beta"
4+
MODEM_VERSION = "0.17.6-beta"
55
API_VERSION = 3
66
ARQ_PROTOCOL_VERSION = 1
77
LICENSE = 'GPL3.0'

freedata_server/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async def lifespan(app: FastAPI):
4747
# Create FastAPI app with unified lifespan
4848
app = FastAPI(
4949
title="FreeDATA API",
50-
version=API_VERSION,
50+
version=str(API_VERSION),
5151
lifespan=lifespan,
5252
)
5353

0 commit comments

Comments
 (0)