From be3fc25507c9b530ed567afdac0ba244b7bd9d6c Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 12 Dec 2022 20:58:50 +0100 Subject: [PATCH 01/11] Update to Android 12 --- Borepin/Borepin.Android/Borepin.Android.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index 9b97e58..9b2cd9f 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -16,7 +16,7 @@ Properties\AndroidManifest.xml Resources Assets - v11.0 + v12.0 true true Xamarin.Android.Net.AndroidClientHandler From 0259349d69fcc1c8edc55628ac3e7f7d5c259e11 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 12 Dec 2022 21:01:05 +0100 Subject: [PATCH 02/11] Update to Android 13 --- Borepin/Borepin.Android/Borepin.Android.csproj | 2 +- Borepin/Borepin.Android/Properties/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index 9b2cd9f..3dd24cb 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -16,7 +16,7 @@ Properties\AndroidManifest.xml Resources Assets - v12.0 + v13.0 true true Xamarin.Android.Net.AndroidClientHandler diff --git a/Borepin/Borepin.Android/Properties/AndroidManifest.xml b/Borepin/Borepin.Android/Properties/AndroidManifest.xml index f8a66e9..45d1042 100644 --- a/Borepin/Borepin.Android/Properties/AndroidManifest.xml +++ b/Borepin/Borepin.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + From 0a846482f082f74518cbbe9214f3313e118ba576 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 25 Jan 2023 00:49:10 +0000 Subject: [PATCH 03/11] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 54 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d3865c..8ddca5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,29 +180,39 @@ deploy_Android_Internal: after_script: - 'rm play-store-credentials.json' -pages: - stage: deploy - needs: - - pack_Android_APK - - pack_iOS - rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ - tags: - - docker - image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest - variables: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' +upload_binaries: + stage: deploy + needs: + - pack_Android_APK + - pack_iOS + tags: + - docker + image: curlimages/curl:latest + before_script: [] + cache: [] + script: + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/borepin/${CI_COMMIT_TAG}/org.fab_infra.fabaccess-Signed.apk"' + rules: + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ - before_script: - - 'export VERSION_NUMBER=${CI_COMMIT_TAG:1}' - - 'export BUILD_NUMBER="$CI_PIPELINE_ID"' - script: - - 'mkdir -p public' - - 'cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk public/' - artifacts: - paths: - - public +release_job: + stage: deploy + needs: + - upload_binaries + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + when: manual + script: + - echo "Creating GitLab release…" + release: + name: "Borepin ${CI_COMMIT_TAG}" + description: "GitLab CI auto-created release" + tag_name: "release/${CI_COMMIT_TAG}" + assets: + links: + - name: 'Borepin signed apk' + url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/borepin/${CI_COMMIT_TAG}/org.fab_infra.fabaccess-Signed.apk" deploy_Android_Beta: stage: deploy From a2d8e4d85a7c5f0df2e929a21367a0fc39a735e0 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 25 Jan 2023 19:30:31 +0000 Subject: [PATCH 04/11] publish fdroid repo --- .gitlab-ci.yml | 40 +++++++++++++++++++-- fdroid/config.yml | 9 +++++ fdroid/metadata/org.fab_infra.fabaccess.yml | 8 +++++ 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 fdroid/config.yml create mode 100644 fdroid/metadata/org.fab_infra.fabaccess.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d3865c..f38e047 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,6 +133,32 @@ pack_Android_APK: paths: - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk +pack_FDroid_APK: + stage: pack + needs: + - build_Android + rules: + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + tags: + - fabinfra + - internal + - windows + - powershell + - xamarin + before_script: + - '$Env:VERSION_NUMBER="$CI_COMMIT_TAG".SubString(1)' + - '$Env:BUILD_NUMBER="$CI_PIPELINE_ID"' + - '$Env:ANDROID_PKG_FORMAT="apk"' + script: + - '& "$WIN_NUGET_PATH" restore' + - '[System.IO.File]::WriteAllBytes("$(pwd)/fabaccess.keystore", [System.Convert]::FromBase64String($FDroidKeyStore))' + - '& "$WIN_MSBUILD_PATH" /t:Restore /t:Borepin_Android:SetVersion /p:Configuration=Release /target:Borepin_Android /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore="True" /p:AndroidSigningKeyStore="$(pwd)/fabaccess.keystore" /p:AndroidSigningKeyPass="$FDroidKeyStore_Password" /p:AndroidSigningKeyAlias="$FDroidKeyStore_ID" /p:AndroidSigningStorePass="$FDroidKeyStore_Password"' + - 'rm "$(pwd)/fabaccess.keystore"' + artifacts: + expire_in: 1 week + paths: + - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk + pack_iOS: stage: pack needs: @@ -183,13 +209,13 @@ deploy_Android_Internal: pages: stage: deploy needs: - - pack_Android_APK + - pack_FDroid_APK - pack_iOS rules: - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ tags: - docker - image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest + image: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest variables: LC_ALL: 'en_US.UTF-8' LANG: 'en_US.UTF-8' @@ -197,9 +223,17 @@ pages: before_script: - 'export VERSION_NUMBER=${CI_COMMIT_TAG:1}' - 'export BUILD_NUMBER="$CI_PIPELINE_ID"' + - cp -r fdroid/* . + - echo "keystorepass: ${FDroid_KeyStore_Password}" >> config.yml + - echo "keypass: ${FDroid_KeyStore_Password}" >> config.yml + - echo ${FDroid_KeyStore} | base64 -d > keystore.p12 script: + - mkdir repo + - cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk repo/ + - fdroid update - 'mkdir -p public' - - 'cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk public/' + - 'cp -r repo/* public/' + - rm keystore.p12 artifacts: paths: - public diff --git a/fdroid/config.yml b/fdroid/config.yml new file mode 100644 index 0000000..9f41209 --- /dev/null +++ b/fdroid/config.yml @@ -0,0 +1,9 @@ +repo_keyalias: Persephone + +keydname: CN=Persephone, OU=F-Droid + + + +repo_url: "https://fdroid.fab-access.org" +repo_name: "FabAccess F-Droid Repo" +repo_description: F-Droid repo for FabAccess. diff --git a/fdroid/metadata/org.fab_infra.fabaccess.yml b/fdroid/metadata/org.fab_infra.fabaccess.yml new file mode 100644 index 0000000..20f1bb7 --- /dev/null +++ b/fdroid/metadata/org.fab_infra.fabaccess.yml @@ -0,0 +1,8 @@ +AuthorName: 'RLKM UG (haftungsbeschränkt)' +Categories: +- Productivity +IssueTracker: 'https://gitlab.com/fabinfra/fabaccess/borepin/-/issues' +Name: FabAccess +SourceCode: 'https://gitlab.com/fabinfra/fabaccess/borepin' +Summary: 'FabAccess is a federatable management system for FabLabs, Makerspaces and Hackerspaces. FabAccess aims to manage access to machines in order to avoid accidents.' +WebSite: 'https://fab-access.org' \ No newline at end of file From 57e6b4aa5a6aec3554d11e4a44a4e562b576a1ed Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 25 Jan 2023 19:32:27 +0000 Subject: [PATCH 05/11] fix pages yaml for pages --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f38e047..1fb2688 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,17 +223,17 @@ pages: before_script: - 'export VERSION_NUMBER=${CI_COMMIT_TAG:1}' - 'export BUILD_NUMBER="$CI_PIPELINE_ID"' - - cp -r fdroid/* . - - echo "keystorepass: ${FDroid_KeyStore_Password}" >> config.yml - - echo "keypass: ${FDroid_KeyStore_Password}" >> config.yml - - echo ${FDroid_KeyStore} | base64 -d > keystore.p12 + - 'cp -r fdroid/* .' + - 'echo "keystorepass: ${FDroid_KeyStore_Password}" >> config.yml' + - 'echo "keypass: ${FDroid_KeyStore_Password}" >> config.yml' + - 'echo ${FDroid_KeyStore} | base64 -d > keystore.p12' script: - - mkdir repo - - cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk repo/ - - fdroid update + - 'mkdir repo' + - 'cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk repo/' + - 'fdroid update' - 'mkdir -p public' - 'cp -r repo/* public/' - - rm keystore.p12 + - 'rm keystore.p12' artifacts: paths: - public From c22ad5b90badb151746ac51145a46936b35e5cfc Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 25 Jan 2023 19:47:13 +0000 Subject: [PATCH 06/11] fix tags for release job --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ddca5b..6d70d1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -200,6 +200,8 @@ release_job: needs: - upload_binaries image: registry.gitlab.com/gitlab-org/release-cli:latest + tags: + - docker rules: - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ when: manual From bc945162a4684ff4512cbe40c87b24d918469bc5 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 25 Jan 2023 19:48:58 +0000 Subject: [PATCH 07/11] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d70d1b..b9573ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,7 +184,6 @@ upload_binaries: stage: deploy needs: - pack_Android_APK - - pack_iOS tags: - docker image: curlimages/curl:latest From ba5880e82050ab35a6db039fac706f67d6e8ca79 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 26 Jan 2023 00:52:40 +0000 Subject: [PATCH 08/11] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 152603b..242452a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - VERSION_PATTERN: '/v\d+\.\d+(\.\d+)?/' + VERSION_PATTERN: '/^v\d+\.\d+(\.\d+)?$/' GIT_SUBMODULE_STRATEGY: recursive LIB_RELEASE_FOLDER: 'Borepin\Borepin\bin\Release' UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\bin\x86\Release' @@ -87,7 +87,7 @@ pack_Android_AAB: needs: - build_Android rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - fabinfra - internal @@ -112,7 +112,7 @@ pack_Android_APK: needs: - build_Android rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - fabinfra - internal @@ -138,7 +138,7 @@ pack_FDroid_APK: needs: - build_Android rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - fabinfra - internal @@ -164,7 +164,7 @@ pack_iOS: needs: - build_iOS rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - fabinfra - internal @@ -188,7 +188,7 @@ deploy_Android_Internal: needs: - pack_Android_AAB rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - docker image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest @@ -211,10 +211,11 @@ pages: needs: - pack_FDroid_APK rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - docker image: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest + entrypoint: [""] variables: LC_ALL: 'en_US.UTF-8' LANG: 'en_US.UTF-8' @@ -249,7 +250,7 @@ upload_binaries: script: - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/borepin/${CI_COMMIT_TAG}/org.fab_infra.fabaccess-Signed.apk"' rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN release_job: stage: deploy @@ -259,7 +260,9 @@ release_job: tags: - docker rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN + - if: $CI_COMMIT_TAG =~ "release/.*" + when: never when: manual script: - echo "Creating GitLab release…" @@ -277,7 +280,7 @@ deploy_Android_Beta: needs: - deploy_Android_Internal rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN when: manual tags: - docker @@ -300,7 +303,7 @@ deploy_Android_Production: needs: - deploy_Android_Beta rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN when: manual tags: - docker @@ -323,7 +326,7 @@ deploy_iOS_Internal: needs: - pack_iOS rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - fabinfra - internal @@ -350,7 +353,7 @@ deploy_iOS_Beta: needs: - pack_iOS rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN when: manual tags: - fabinfra @@ -378,7 +381,7 @@ deploy_iOS_Production: needs: - deploy_iOS_Beta rules: - - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /v\d+\.\d+(\.\d+)?/ + - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN when: manual tags: - fabinfra From eeea0ed6819a9f4516d6602433310cb2386905eb Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 26 Jan 2023 00:54:49 +0000 Subject: [PATCH 09/11] fix entrypoint syntax --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 242452a..01a4dad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,8 +214,9 @@ pages: - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - docker - image: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest - entrypoint: [""] + image: + name: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest + entrypoint: [""] variables: LC_ALL: 'en_US.UTF-8' LANG: 'en_US.UTF-8' From 9147dcd63223770a3b088a297483dee2ff478d0b Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Thu, 26 Jan 2023 05:11:38 +0000 Subject: [PATCH 10/11] Fixed FDroid CI --- .gitlab-ci.yml | 28 +++++++++++---------- fdroid/config.yml | 2 +- fdroid/metadata/org.fab_infra.fabaccess.yml | 3 ++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a4dad..915493f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,26 +214,28 @@ pages: - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN tags: - docker - image: - name: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest - entrypoint: [""] - variables: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - + image: + name: ubuntu + # name: registry.gitlab.com/fdroid/docker-executable-fdroidserver:master + variables: + DEBIAN_FRONTEND: noninteractive + TZ: Europe/Berlin before_script: + - 'apt-get update -yqq && apt-get install -yqq fdroidserver' - 'export VERSION_NUMBER=${CI_COMMIT_TAG:1}' - 'export BUILD_NUMBER="$CI_PIPELINE_ID"' - 'cp -r fdroid/* .' - - 'echo "keystorepass: ${FDroid_KeyStore_Password}" >> config.yml' - - 'echo "keypass: ${FDroid_KeyStore_Password}" >> config.yml' - - 'echo ${FDroid_KeyStore} | base64 -d > keystore.p12' + - 'echo "keystorepass: ${FDroidKeyStore_Password}" >> config.yml' + - 'echo "keypass: ${FDroidKeyStore_Password}" >> config.yml' + - 'echo ${FDroidKeyStore} | base64 -d > keystore.p12' + # - 'cat config.yml' + # - sha1sum keystore.p12 script: - - 'mkdir repo' + - 'mkdir -p repo' - 'cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk repo/' - 'fdroid update' - - 'mkdir -p public' - - 'cp -r repo/* public/' + - 'mkdir -p public/fdroid' + - 'cp -r repo public/fdroid/' - 'rm keystore.p12' artifacts: paths: diff --git a/fdroid/config.yml b/fdroid/config.yml index 9f41209..0443606 100644 --- a/fdroid/config.yml +++ b/fdroid/config.yml @@ -4,6 +4,6 @@ keydname: CN=Persephone, OU=F-Droid -repo_url: "https://fdroid.fab-access.org" +repo_url: "https://fdroid.fab-access.org/fdroid/repo" repo_name: "FabAccess F-Droid Repo" repo_description: F-Droid repo for FabAccess. diff --git a/fdroid/metadata/org.fab_infra.fabaccess.yml b/fdroid/metadata/org.fab_infra.fabaccess.yml index 20f1bb7..5fec26f 100644 --- a/fdroid/metadata/org.fab_infra.fabaccess.yml +++ b/fdroid/metadata/org.fab_infra.fabaccess.yml @@ -5,4 +5,5 @@ IssueTracker: 'https://gitlab.com/fabinfra/fabaccess/borepin/-/issues' Name: FabAccess SourceCode: 'https://gitlab.com/fabinfra/fabaccess/borepin' Summary: 'FabAccess is a federatable management system for FabLabs, Makerspaces and Hackerspaces. FabAccess aims to manage access to machines in order to avoid accidents.' -WebSite: 'https://fab-access.org' \ No newline at end of file +WebSite: 'https://fab-access.org' +License: GPL-3.0-only \ No newline at end of file From cb001768499b9fecb6fef8b6921b36cd12f791a1 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Tue, 31 Jan 2023 01:49:55 +0100 Subject: [PATCH 11/11] Fixed: Profile Page --- Borepin/Borepin/Page/ProfilePage.xaml | 1 + external/NFC | 2 +- external/capnproto-dotnetcore | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Borepin/Borepin/Page/ProfilePage.xaml b/Borepin/Borepin/Page/ProfilePage.xaml index 6f21c73..834c3e9 100644 --- a/Borepin/Borepin/Page/ProfilePage.xaml +++ b/Borepin/Borepin/Page/ProfilePage.xaml @@ -7,6 +7,7 @@ Title="{x:Static resource_text:TextResource.TITLE_Profile}"> + diff --git a/external/NFC b/external/NFC index 4420dbf..e79b6aa 160000 --- a/external/NFC +++ b/external/NFC @@ -1 +1 @@ -Subproject commit 4420dbf1b1e820d94d6adaa2b65a851ac582be8f +Subproject commit e79b6aace26c8b362a5f450345a67ba700f06805 diff --git a/external/capnproto-dotnetcore b/external/capnproto-dotnetcore index 63e6385..a70eecd 160000 --- a/external/capnproto-dotnetcore +++ b/external/capnproto-dotnetcore @@ -1 +1 @@ -Subproject commit 63e63853c1d5ca9f223aa3627ad391ce434a0683 +Subproject commit a70eecd99112b16902128b8b4b2c95b2721fdf0e