Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dainst/idai-field
Browse files Browse the repository at this point in the history
  • Loading branch information
tkleinke committed Dec 16, 2024
2 parents eef6b3a + 217c553 commit 37945d6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
working-directory: desktop
Build:
name: Build (${{ matrix.os.name }})
if: ${{ (github.ref == 'refs/heads/master') || (contains(github.event.head_commit.message, '[build]')) }}
strategy:
matrix:
os:
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
[![Manual](https://img.shields.io/badge/Manual-field.idai.world-green)](https://field.idai.world/manual)
<!-- badges: end -->

Field is the German Archaeological Institutes take on digital field and find recording. For an overview of the genesis and the idea behind Field, check out one of our latest articles:
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!

For an overview of the genesis and the idea behind Field, check out one of our latest articles:

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).

Expand Down
4 changes: 2 additions & 2 deletions desktop/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Field Desktop
The German Archaeological Institute’s ([DAI](https://www.dainst.org)) new take on a field research documentation system.

Field Desktop 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 Desktop is completely Open Source and free to use!

## Usage

Expand Down

0 comments on commit 37945d6

Please sign in to comment.