mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-11-14 16:09:31 +01:00
Merge branch 'main' into 'braid/android-notification'
# Conflicts: # pubspec.lock # pubspec.yaml
This commit is contained in:
commit
e2f8f28a58
@ -20,10 +20,16 @@ code_analyze:
|
||||
artifacts:
|
||||
reports:
|
||||
codequality: code-quality-report.json
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
widget_test:
|
||||
stage: test
|
||||
script: [flutter test]
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
# the basic integration test configuration testing FLOSS builds on Synapse
|
||||
.integration_test:
|
||||
@ -62,6 +68,9 @@ widget_test:
|
||||
- flutter pub get
|
||||
- flutter test integration_test
|
||||
timeout: 20m
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
|
||||
# integration tests for Linux builds
|
||||
@ -99,6 +108,9 @@ widget_test:
|
||||
# generate temporary release build configuration and ensure app launches
|
||||
- scripts/integration-check-release-build.sh
|
||||
timeout: 20m
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
build_web:
|
||||
stage: build
|
||||
@ -108,6 +120,9 @@ build_web:
|
||||
artifacts:
|
||||
paths:
|
||||
- build/web/
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
build_windows:
|
||||
extends:
|
||||
@ -133,6 +148,9 @@ build_android_debug:
|
||||
except:
|
||||
- main
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
|
||||
build_android_apk:
|
||||
stage: build
|
||||
@ -144,6 +162,9 @@ build_android_apk:
|
||||
when: on_success
|
||||
paths:
|
||||
- build/android/app-release.apk
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
only:
|
||||
- main
|
||||
- tags
|
||||
@ -159,6 +180,9 @@ deploy_playstore_internal:
|
||||
paths:
|
||||
- build/android/app-release.aab
|
||||
resource_group: playstore_release
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
only:
|
||||
- main
|
||||
|
||||
@ -177,6 +201,9 @@ fdroid_repo:
|
||||
needs:
|
||||
- "build_android_apk"
|
||||
resource_group: playstore_release
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
allow_failure: true
|
||||
only:
|
||||
- main
|
||||
@ -215,6 +242,9 @@ build_linux_x86:
|
||||
sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y,
|
||||
]
|
||||
script: [./scripts/build-linux.sh]
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
artifacts:
|
||||
when: on_success
|
||||
paths:
|
||||
@ -263,6 +293,9 @@ update_dependencies:
|
||||
.release:
|
||||
stage: deploy
|
||||
image: curlimages/curl:latest
|
||||
tags:
|
||||
- docker
|
||||
- famedly
|
||||
rules:
|
||||
- if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/'
|
||||
- if: '$CI_COMMIT_TAG =~ /^rc\d+\.\d+\.\d+-\d+$/'
|
||||
|
@ -1,4 +1,7 @@
|
||||
## v1.7.1 2022 11-23
|
||||
## v1.7.2 2022-12-19
|
||||
Update dependencies and translations.
|
||||
|
||||
## v1.7.1 2022-11-23
|
||||
Minor bugfix release to retrigger build for FlatPak and Android. Fixes some style bugs and updates some translations
|
||||
|
||||
## v1.7.0 2022-11-17
|
||||
|
@ -3018,5 +3018,12 @@
|
||||
}
|
||||
},
|
||||
"commandHint_googly": "Saada ühed otsivad silmad",
|
||||
"@commandHint_googly": {}
|
||||
"@commandHint_googly": {},
|
||||
"wasDirectChatDisplayName": "Sõnumiteta vestlus (vana nimega {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2991,5 +2991,39 @@
|
||||
"hideUnimportantStateEvents": "Masquer les événements d'état sans importance",
|
||||
"@hideUnimportantStateEvents": {},
|
||||
"doNotShowAgain": "Ne plus afficher",
|
||||
"@doNotShowAgain": {}
|
||||
"@doNotShowAgain": {},
|
||||
"commandHint_googly": "Envoyer des yeux écarquillés",
|
||||
"@commandHint_googly": {},
|
||||
"commandHint_cuddle": "Envoyer un câlin",
|
||||
"@commandHint_cuddle": {},
|
||||
"commandHint_hug": "Envoyer une accolade",
|
||||
"@commandHint_hug": {},
|
||||
"googlyEyesContent": "{senderName} vous envoie des yeux écarquillés",
|
||||
"@googlyEyesContent": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"cuddleContent": "{senderName} vous fait un câlin",
|
||||
"@cuddleContent": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"hugContent": "{senderName} vous fait une accolade",
|
||||
"@hugContent": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"wasDirectChatDisplayName": "Discussion vide (était {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3012,5 +3012,12 @@
|
||||
"commandHint_hug": "Kirim pelukan",
|
||||
"@commandHint_hug": {},
|
||||
"commandHint_cuddle": "Kirim berpelukan",
|
||||
"@commandHint_cuddle": {}
|
||||
"@commandHint_cuddle": {},
|
||||
"wasDirectChatDisplayName": "Obrolan kosong (sebelumnya {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3017,5 +3017,12 @@
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"wasDirectChatDisplayName": "Lege chat (was {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3018,5 +3018,12 @@
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"wasDirectChatDisplayName": "Boş sohbet ({oldDisplayName} idi)",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3013,5 +3013,12 @@
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"wasDirectChatDisplayName": "Порожня бесіда (раніше {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3018,5 +3018,12 @@
|
||||
"placeholders": {
|
||||
"senderName": {}
|
||||
}
|
||||
},
|
||||
"wasDirectChatDisplayName": "空聊天(曾是 {oldDisplayName})",
|
||||
"@wasDirectChatDisplayName": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
"oldDisplayName": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -63,6 +63,8 @@
|
||||
<string>Share your location with your contacts in FluffyChat.</string>
|
||||
<key>NSLocationWhenInUseUsageDescription</key>
|
||||
<string>Share your location with your contacts in FluffyChat.</string>
|
||||
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
|
||||
<string>Share your location with your contacts in FluffyChat.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Record voice message and share them with your contacts on FluffyChat.</string>
|
||||
<key>NSMotionUsageDescription</key>
|
||||
|
@ -1,7 +1,7 @@
|
||||
name: fluffychat
|
||||
description: Chat with your friends.
|
||||
publish_to: none
|
||||
version: 1.7.1+2329
|
||||
version: 1.7.2+2330
|
||||
|
||||
environment:
|
||||
sdk: ">=2.12.0 <3.0.0"
|
||||
|
Loading…
Reference in New Issue
Block a user