Skip to content

Commit

Permalink
Merge branch 'master' into qr_codes_integration
Browse files Browse the repository at this point in the history
  • Loading branch information
tkleinke committed Jan 26, 2024
2 parents e93fe04 + 13efc6f commit bcddf3c
Show file tree
Hide file tree
Showing 538 changed files with 126,049 additions and 100,514 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ jobs:
MAC_NOTARIZE: ${{ contains(github.event.head_commit.message, '[notarize]') && 'true' || 'false' }}
MAC_NOTARIZE_AID: ${{ secrets.MAC_NOTARIZE_AID }}
MAC_NOTARIZE_PW: ${{ secrets.MAC_NOTARIZE_PW }}
MAC_NOTARIZE_TID: ${{ secrets.MAC_NOTARIZE_TID }}
MAC_NOTARIZE_TEAM_ID: ${{ secrets.MAC_NOTARIZE_TEAM_ID }}
working-directory: desktop
- name: Create Windows package
run: npm run package:win
if: runner.os == 'Windows'
env:
CSC_LINK: ${{ secrets.WIN_CERT }}
CSC_KEY_PASSWORD: ${{ secrets.WIN_CERT_PW }}
# env:
# CSC_LINK: ${{ secrets.WIN_CERT }}
# CSC_KEY_PASSWORD: ${{ secrets.WIN_CERT_PW }}
working-directory: desktop
- name: Create Linux package
run: npm run package:lnx
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
- uses: actions/checkout@v2
- uses: erlef/setup-beam@v1
with:
otp-version: 24.3
elixir-version: 1.13.4
- name: Install inotify-tools
run: sudo apt-get install inotify-tools
otp-version: 26.0
elixir-version: 1.16.0
- name: Start CouchDB
run: docker-compose -f docker-compose.yml --env-file .env_template up -d &
run: docker-compose -f docker-compose.yml --env-file .env_template up -d
working-directory: server
- name: Setup server
- name: Sleep to await CouchDB startup
run: sleep 15s
- name: Install FieldHub dependencies and run setup
run: mix setup
working-directory: server
- name: Run server tests
- name: Run FieldHub tests
run: mix test
working-directory: server
working-directory: server
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

This is a monorepo containing five packages:

* [Field Desktop](desktop): The Field Desktop application based on AngularJS and Electron
* [Field Mobile](mobile): The Field Mobile application based on React Native, early development, no release yet
* [Field Server](server): The FieldHub server application
* [Field Desktop](desktop): The Field Desktop application based on Angular and Electron
* [Field Mobile](mobile): The Field Mobile application based on React Native (early development, no release yet)
* [FieldHub](server): The (optional) synchronisation server application.
* [Field Core](core): Shared TypeScript modules
* [iDAI.field Web](web): The iDAI.field Web publication platform

Expand Down
9 changes: 9 additions & 0 deletions core/config/Core/Language.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@
"borders": {
"label": "Grenzt an"
},
"abuts": {
"label": "Stößt an"
},
"isAbuttedBy": {
"label": "Wird angestoßen von"
},
"bondsWith": {
"label": "Bindet ein"
},
"isAfter": {
"label": "Zeitlich nach"
},
Expand Down
112 changes: 112 additions & 0 deletions core/config/Core/Language.el.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"fields": {
"category": {
"label": ""
},
"identifier": {
"label": "",
"description": ""
},
"shortDescription": {
"label": ""
}
},
"categories": {
"Project": {
"label": "",
"fields": {
"coordinateReferenceSystem": {
"label": ""
},
"shortName": {
"label": ""
}
}
},
"Image": {
"label": "",
"fields": {
"height": {
"label": ""
},
"width": {
"label": ""
}
}
}
},
"relations": {
"isRecordedIn": {
"label": ""
},
"liesWithin": {
"label": ""
},
"includes": {
"label": ""
},
"isPresentIn": {
"label": ""
},
"isAbove": {
"label": ""
},
"isBelow": {
"label": ""
},
"isSameAs": {
"label": ""
},
"cuts": {
"label": ""
},
"isCutBy": {
"label": ""
},
"fills": {
"label": ""
},
"isFilledBy": {
"label": ""
},
"borders": {
"label": ""
},
"abuts": {
"label": ""
},
"isAbuttedBy": {
"label": ""
},
"bondsWith": {
"label": ""
},
"isAfter": {
"label": ""
},
"isBefore": {
"label": ""
},
"isContemporaryWith": {
"label": ""
},
"depicts": {
"label": ""
},
"isDepictedIn": {
"label": ""
},
"isMapLayerOf": {
"label": ""
},
"hasMapLayer": {
"label": ""
},
"isInstanceOf": {
"label": ""
},
"hasInstance": {
"label": ""
}
}
}
9 changes: 9 additions & 0 deletions core/config/Core/Language.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@
"isFilledBy": {
"label": "Filled by"
},
"abuts": {
"label": "Abuts"
},
"isAbuttedBy": {
"label": "Abutted by"
},
"bondsWith": {
"label": "Bonds with"
},
"borders": {
"label": "Borders"
},
Expand Down
9 changes: 9 additions & 0 deletions core/config/Core/Language.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@
"borders": {
"label": "Adyacente a"
},
"abuts": {
"label": "Se apoya en"
},
"isAbuttedBy": {
"label": "Se le apoya"
},
"bondsWith": {
"label": "Se une a"
},
"isAfter": {
"label": "Cronología: después de"
},
Expand Down
11 changes: 10 additions & 1 deletion core/config/Core/Language.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,18 @@
"isFilledBy": {
"label": "Riempito da"
},
"borders": {
"abuts": {
"label": "Si appoggia a"
},
"isAbuttedBy": {
"label": "Gli si appoggia"
},
"bondsWith": {
"label": "Si lega a"
},
"borders": {
"label": "Confina con"
},
"isAfter": {
"label": "Cronologicamente posteriore a"
},
Expand Down
71 changes: 40 additions & 31 deletions core/config/Core/Language.tr.json
Original file line number Diff line number Diff line change
@@ -1,103 +1,112 @@
{
"fields": {
"category": {
"label": ""
"label": "Kategori"
},
"identifier": {
"label": "",
"description": ""
"label": "Tanımlayıcı",
"description": "Girdinin eşsiz tanımlayıcı kodu"
},
"shortDescription": {
"label": ""
"label": "Kısa açıklama"
}
},
"categories": {
"Project": {
"label": "",
"label": "Proje",
"fields": {
"coordinateReferenceSystem": {
"label": ""
"label": "Koordinat referans sistemi"
},
"shortName": {
"label": ""
"label": "Proje adı"
}
}
},
"Image": {
"label": "",
"label": "Görüntü",
"fields": {
"height": {
"label": ""
"label": "Boyu"
},
"width": {
"label": ""
"label": "Eni"
}
}
}
},
"relations": {
"isRecordedIn": {
"label": ""
"label": "Çalışmada kaydedildi"
},
"liesWithin": {
"label": ""
"label": "İçinde bulunur"
},
"includes": {
"label": ""
"label": "İçerir"
},
"isPresentIn": {
"label": ""
"label": "Profil/alanda bulunur"
},
"isAbove": {
"label": ""
"label": "Üstünde"
},
"isBelow": {
"label": ""
"label": "Altında"
},
"isSameAs": {
"label": ""
"label": "Benzer"
},
"cuts": {
"label": ""
"label": "Kes(iş)mektedir"
},
"isCutBy": {
"label": ""
"label": "tarafından kesilmektedir"
},
"fills": {
"label": ""
"label": "Doldurur"
},
"isFilledBy": {
"label": ""
"label": "tarafından doldurulmaktadır"
},
"borders": {
"label": ""
"label": "Sınırında"
},
"isAfter": {
"label": ""
"label": "Sonra"
},
"isBefore": {
"label": ""
"label": "Önce"
},
"isContemporaryWith": {
"label": ""
"label": "ile çağdaş"
},
"depicts": {
"label": ""
"label": "Tasvir"
},
"isDepictedIn": {
"label": ""
"label": "Tasvir edilen"
},
"isMapLayerOf": {
"label": ""
"label": "Harita katmanı"
},
"hasMapLayer": {
"label": ""
"label": "Harita katmanı var"
},
"isInstanceOf": {
"label": ""
"label": "Tipolojik sınıflandırma"
},
"hasInstance": {
"label": ""
"label": "İlişkili buluntular"
},
"abuts": {
"label": "ile bitişik"
},
"isAbuttedBy": {
"label": "ile bitiştirilmiş"
},
"bondsWith": {
"label": "ile bağlı"
}
}
}
Loading

0 comments on commit bcddf3c

Please sign in to comment.