Skip to content

Commit 04379b1

Browse files
tkleinketkleinke
authored
Merge branch 'master' into master
2 parents 5987868 + f06ef24 commit 04379b1

File tree

2,357 files changed

+263307
-224585
lines changed

Some content is hidden

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

2,357 files changed

+263307
-224585
lines changed

‎.github/workflows/desktop.yml‎

Lines changed: 3 additions & 11 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,15 +68,7 @@ jobs:
6868
- name: Setup NodeJS
6969
uses: actions/setup-node@v4
7070
with:
71-
node-version: 20
72-
- name: Install sharp for x64 architecture
73-
run: npm install --cpu=x64 --os=darwin sharp
74-
if: runner.os == 'macOS'
75-
working-directory: desktop
76-
- name: Install sharp for arm64 architecture
77-
run: npm install --cpu=arm64 --os=darwin sharp
78-
if: runner.os == 'macOS'
79-
working-directory: desktop
71+
node-version: 22
8072
- name: Install root node modules
8173
run: npm i
8274
- name: Install and link package node modules

‎.github/workflows/publication.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ jobs:
2222
working-directory: publication
2323
- name: Sleep to await CouchDB startup
2424
run: sleep 15s
25+
- name: Restore dependencies cache
26+
uses: actions/cache@v4
27+
with:
28+
path: publication/deps
29+
key: ${{ runner.os }}-mix-${{ hashFiles('publication/mix.lock') }}
30+
restore-keys: ${{ runner.os }}-mix-
2531
- name: Install Field Publication dependencies and run setup
2632
run: mix setup
2733
working-directory: publication

‎.github/workflows/server.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@ 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
2323
- name: Sleep to await CouchDB startup
2424
run: sleep 15s
25+
- name: Restore dependencies cache
26+
uses: actions/cache@v4
27+
with:
28+
path: server/deps
29+
key: ${{ runner.os }}-mix-${{ hashFiles('server/mix.lock') }}
30+
restore-keys: ${{ runner.os }}-mix-
2531
- name: Install Field Hub dependencies and run setup
2632
run: mix setup
2733
working-directory: server

‎README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@
77

88
Field is a modern take on flexible field and find recording for archaeological excavations. It is developed as a cooperation between the German Archaeological Institute ([DAI](https://www.dainst.org)) and the Head Office of the GBV Common Library Network ([GBV](https://en.gbv.de/)). Field is completely Open Source and free to use!
99

10+
## Field Day on 4th December 2025
11+
12+
We invite excavation projects, researchers, and teams to showcase how you use Field in your work. Whether you've solved tricky documentation challenges, integrated Field into a complex workflow, or simply use it for your digital documentation: we want to hear from you!
13+
14+
The event is organized by the Forum for Digital Archaeology and Infrastructure (FdAI). It will take place on Thursday, 4th December 2025 (online).
15+
16+
Please take a look at our [announcement](https://github.com/dainst/idai-field/discussions/354) to learn more about how to participate.
17+
18+
## About Field
19+
1020
For an overview of the genesis and the idea behind Field, check out one of our latest articles:
1121

1222
S. Hohl – T. Kleinke – F. Riebschläger – J. Watson, **iDAI.field: developing software for the documentation of archaeological fieldwork**, AeC 34, 1, 2023, 85–94, doi: [10.19282/ac.34.1.2023.10](https://doi.org/10.19282/ac.34.1.2023.10).

‎core/config/Config-AbbirCella.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@
193193
"processor",
194194
"campaign",
195195
"diary",
196-
"beginningDate",
197-
"endDate",
196+
"date",
198197
"isSameAs"
199198
]
200199
},
@@ -653,8 +652,7 @@
653652
"processor",
654653
"campaign",
655654
"diary",
656-
"beginningDate",
657-
"endDate",
655+
"date",
658656
"isSameAs"
659657
]
660658
},
@@ -784,8 +782,7 @@
784782
"processor",
785783
"campaign",
786784
"diary",
787-
"beginningDate",
788-
"endDate",
785+
"date",
789786
"isSameAs"
790787
]
791788
},
@@ -896,8 +893,7 @@
896893
"processor",
897894
"campaign",
898895
"diary",
899-
"beginningDate",
900-
"endDate",
896+
"date",
901897
"isSameAs"
902898
]
903899
},
@@ -1701,8 +1697,7 @@
17011697
"processor",
17021698
"campaign",
17031699
"diary",
1704-
"beginningDate",
1705-
"endDate",
1700+
"date",
17061701
"isSameAs"
17071702
]
17081703
},
@@ -1864,8 +1859,7 @@
18641859
"processor",
18651860
"campaign",
18661861
"diary",
1867-
"beginningDate",
1868-
"endDate",
1862+
"date",
18691863
"isSameAs"
18701864
]
18711865
},

‎core/config/Config-Ayamonte.json‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@
6464
"supervisor",
6565
"processor",
6666
"campaign",
67-
"beginningDate",
68-
"endDate"
67+
"date"
6968
]
7069
},
7170
{
@@ -180,8 +179,7 @@
180179
"supervisor",
181180
"processor",
182181
"campaign",
183-
"beginningDate",
184-
"endDate",
182+
"date",
185183
"diary"
186184
]
187185
},
@@ -391,8 +389,7 @@
391389
"processor",
392390
"campaign",
393391
"diary",
394-
"beginningDate",
395-
"endDate",
392+
"date",
396393
"isSameAs",
397394
"date"
398395
]
@@ -778,8 +775,7 @@
778775
"processor",
779776
"campaign",
780777
"diary",
781-
"beginningDate",
782-
"endDate",
778+
"date",
783779
"isSameAs",
784780
"date"
785781
]
@@ -970,8 +966,7 @@
970966
"processor",
971967
"campaign",
972968
"diary",
973-
"beginningDate",
974-
"endDate",
969+
"date",
975970
"isSameAs",
976971
"date"
977972
]
@@ -1078,8 +1073,7 @@
10781073
"processor",
10791074
"campaign",
10801075
"diary",
1081-
"beginningDate",
1082-
"endDate",
1076+
"date",
10831077
"isSameAs",
10841078
"date"
10851079
]
@@ -1156,8 +1150,7 @@
11561150
"processor",
11571151
"campaign",
11581152
"diary",
1159-
"beginningDate",
1160-
"endDate",
1153+
"date",
11611154
"isSameAs",
11621155
"date"
11631156
]
@@ -1504,8 +1497,7 @@
15041497
"processor",
15051498
"campaign",
15061499
"diary",
1507-
"beginningDate",
1508-
"endDate",
1500+
"date",
15091501
"isSameAs",
15101502
"date"
15111503
]
@@ -2159,8 +2151,7 @@
21592151
"processor",
21602152
"campaign",
21612153
"diary",
2162-
"beginningDate",
2163-
"endDate",
2154+
"date",
21642155
"date"
21652156
]
21662157
},

‎core/config/Config-Boha.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@
166166
"processor",
167167
"campaign",
168168
"diary",
169-
"beginningDate",
170-
"endDate",
169+
"date",
171170
"isSameAs"
172171
]
173172
},
@@ -584,8 +583,7 @@
584583
"processor",
585584
"campaign",
586585
"diary",
587-
"beginningDate",
588-
"endDate",
586+
"date",
589587
"isSameAs"
590588
]
591589
},
@@ -780,8 +778,7 @@
780778
"processor",
781779
"campaign",
782780
"diary",
783-
"beginningDate",
784-
"endDate",
781+
"date",
785782
"isSameAs"
786783
]
787784
},
@@ -887,8 +884,7 @@
887884
"processor",
888885
"campaign",
889886
"diary",
890-
"beginningDate",
891-
"endDate",
887+
"date",
892888
"isSameAs"
893889
]
894890
},
@@ -971,8 +967,7 @@
971967
"processor",
972968
"campaign",
973969
"diary",
974-
"beginningDate",
975-
"endDate",
970+
"date",
976971
"isSameAs"
977972
]
978973
},
@@ -1195,8 +1190,7 @@
11951190
"processor",
11961191
"campaign",
11971192
"diary",
1198-
"beginningDate",
1199-
"endDate",
1193+
"date",
12001194
"isSameAs"
12011195
]
12021196
},

‎core/config/Config-Bourgou.json‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
"supervisor",
2222
"processor",
2323
"campaign",
24-
"beginningDate",
25-
"endDate"
24+
"date"
2625
]
2726
},
2827
{
@@ -79,8 +78,7 @@
7978
"supervisor",
8079
"processor",
8180
"campaign",
82-
"beginningDate",
83-
"endDate",
81+
"date",
8482
"diary"
8583
]
8684
},
@@ -245,8 +243,7 @@
245243
"processor",
246244
"campaign",
247245
"diary",
248-
"beginningDate",
249-
"endDate",
246+
"date",
250247
"isSameAs"
251248
]
252249
},
@@ -744,8 +741,7 @@
744741
"processor",
745742
"campaign",
746743
"diary",
747-
"beginningDate",
748-
"endDate",
744+
"date",
749745
"isSameAs"
750746
]
751747
},
@@ -914,8 +910,7 @@
914910
"processor",
915911
"campaign",
916912
"diary",
917-
"beginningDate",
918-
"endDate",
913+
"date",
919914
"isSameAs"
920915
]
921916
},
@@ -1003,8 +998,7 @@
1003998
"processor",
1004999
"campaign",
10051000
"diary",
1006-
"beginningDate",
1007-
"endDate",
1001+
"date",
10081002
"isSameAs"
10091003
]
10101004
},
@@ -1075,8 +1069,7 @@
10751069
"processor",
10761070
"campaign",
10771071
"diary",
1078-
"beginningDate",
1079-
"endDate",
1072+
"date",
10801073
"isSameAs"
10811074
]
10821075
},
@@ -1350,8 +1343,7 @@
13501343
"processor",
13511344
"campaign",
13521345
"diary",
1353-
"beginningDate",
1354-
"endDate",
1346+
"date",
13551347
"isSameAs"
13561348
]
13571349
},
@@ -2026,8 +2018,7 @@
20262018
"processor",
20272019
"campaign",
20282020
"diary",
2029-
"beginningDate",
2030-
"endDate",
2021+
"date",
20312022
"isSameAs"
20322023
]
20332024
},

0 commit comments

Comments
 (0)