Skip to content

Commit b61b0a6

Browse files
Merge branch 'master' into show_ressource_change_history_issue223
merge
2 parents c05148e + c165ca7 commit b61b0a6

File tree

364 files changed

+91679
-149748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+91679
-149748
lines changed

.github/workflows/desktop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 20
21+
node-version: 22
2222
- name: Install dependencies
2323
run: npm run bootstrap
2424
- name: Build core
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v4
4141
- uses: actions/setup-node@v4
4242
with:
43-
node-version: 20
43+
node-version: 22
4444
- name: Install dependencies
4545
run: npm run bootstrap
4646
- name: Build core
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup NodeJS
6969
uses: actions/setup-node@v4
7070
with:
71-
node-version: 20
71+
node-version: 22
7272
- name: Install sharp for x64 architecture
7373
run: npm install --cpu=x64 --os=darwin sharp
7474
if: runner.os == 'macOS'

.github/workflows/server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
- uses: actions/checkout@v2
1616
- uses: erlef/setup-beam@v1
1717
with:
18-
otp-version: 26.0
19-
elixir-version: 1.16.0
18+
otp-version: 27.0
19+
elixir-version: 1.18.0
2020
- name: Start CouchDB
2121
run: docker compose -f docker-compose.yml --env-file .env_template up -d
2222
working-directory: server

core/config/Library/Valuelists/Language.default.pt.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"position-values-expansion-default": {
1010
"values": {
11-
"Maximale Ausdehnung": "Extensão máxima",
12-
"Minimale Ausdehnung": "Extensão mínima"
11+
"Maximale Ausdehnung": "extensão máxima",
12+
"Minimale Ausdehnung": "extensão mínima"
1313
}
1414
},
1515
"position-values-edge-default": {

core/package-lock.json

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Please refer to the [wiki](https://github.com/dainst/idai-field/wiki).
88

99
## Development
1010

11-
Development of Field Desktop works under **MacOS**, **Windows** and **Linux**. In any case, before you start, make sure you have [NodeJS](https://nodejs.org/en/) 20.18 as well as Node Package Manager ([NPM](https://www.npmjs.com/)) installed.
11+
Development of Field Desktop works under **MacOS**, **Windows** and **Linux**. In any case, before you start, make sure you have [NodeJS](https://nodejs.org/en/) 22 as well as Node Package Manager ([NPM](https://www.npmjs.com/)) installed.
1212

1313
Then clone this repository locally and run the following commands (in the repository root):
1414

@@ -46,11 +46,6 @@ To execute the **unit tests**, run
4646
$ npm test
4747
```
4848

49-
The project is set up to manage the compilation of the sources (test as well as regular sources) independently from Angular. This is due to the fact that we perform Node based tests, since our code runs in an Electron context. This is done on the
50-
basis of `test/tsconfig.json` and `jasmine`. To rebuild the sources for tests continually, you can run `npm run build:test+watch` in one terminal window, and `npm test` in another.
51-
52-
For troubleshooting information see [here](docs/unit-test-troubleshooting.md).
53-
5449
To execute **e2e tests**, run
5550

5651
```

desktop/electron/services/gdal.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ const initGdalJs = require('gdal3.js/node');
77
const tempDirectoryPath = global.appDataPath + '/gdal';
88

99
if (fs.existsSync(tempDirectoryPath)) fs.rmSync(tempDirectoryPath, { recursive: true });
10-
fs.mkdirSync(tempDirectoryPath);
10+
11+
try {
12+
fs.mkdirSync(tempDirectoryPath);
13+
} catch (err) {
14+
console.error('Error while trying to create temp directory for gdal', err);
15+
}
1116

1217
const options = {
1318
path: 'lib/gdal',

0 commit comments

Comments
 (0)