ariskotsomitopoulos
|
8a2cd97df0
|
Resolve merge conflicts
|
2022-04-19 11:12:28 +03:00 |
|
ariskotsomitopoulos
|
b96adadf1b
|
Merge branch 'develop' into feature/aris/fix_account_deactivation_issue
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
# vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
|
2022-04-19 11:06:43 +03:00 |
|
Aris Kotsomitopoulos
|
abe07c73a4
|
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience
Enhance user experience when home servers do not support threads.
|
2022-04-19 10:59:41 +03:00 |
|
fedrunov
|
48680c3e2d
|
remove spaces feedback from left panel (#5686)
|
2022-04-19 09:27:17 +02:00 |
|
Glandos
|
765bfd0570
|
Translated using Weblate (French)
Currently translated at 100.0% (55 of 55 strings)
Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
|
2022-04-17 12:59:41 +00:00 |
|
Jozef Gaal
|
cb577756f9
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (2190 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
|
2022-04-17 12:59:40 +00:00 |
|
Suguru Hirahara
|
dc4f11a613
|
Translated using Weblate (Japanese)
Currently translated at 98.2% (2151 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
|
2022-04-17 12:59:40 +00:00 |
|
Glandos
|
fb3e037ed5
|
Translated using Weblate (French)
Currently translated at 100.0% (2190 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
|
2022-04-17 12:59:38 +00:00 |
|
Zet
|
f8a2b6cdf4
|
Translated using Weblate (Arabic)
Currently translated at 35.9% (787 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
|
2022-04-17 12:59:38 +00:00 |
|
Lucas
|
a17e5010f0
|
Translated using Weblate (French)
Currently translated at 99.9% (2189 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
|
2022-04-15 21:59:34 +00:00 |
|
Zet
|
e1bb4da978
|
Translated using Weblate (Arabic)
Currently translated at 32.8% (719 of 2190 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
|
2022-04-15 21:59:34 +00:00 |
|
Benoit Marty
|
903e226e59
|
Restart the timeline when some Event are deleted, for instance when ignoring a user, for the change to take effect
|
2022-04-15 16:30:09 +02:00 |
|
ariskotsomitopoulos
|
1a38b8c3c9
|
Replace var with val
|
2022-04-15 16:32:48 +03:00 |
|
Benoit Marty
|
948566c625
|
Merge pull request #5685 from vector-im/feature/nfe/space_member_spinner_text
add text to spinner when click on space member (dm)
|
2022-04-15 15:14:40 +02:00 |
|
Benoit Marty
|
09abab6ce3
|
Add a picto for ignored users in the room member list screen (#5764)
|
2022-04-15 14:17:35 +02:00 |
|
Benoit Marty
|
cc8f086cc3
|
copyright
|
2022-04-15 13:32:30 +02:00 |
|
Benoit Marty
|
749976a9cd
|
changelog
|
2022-04-15 13:31:49 +02:00 |
|
Benoit Marty
|
cf31381b60
|
changelog
|
2022-04-15 13:30:02 +02:00 |
|
Benoit Marty
|
2fdf71db64
|
Tint the icon
|
2022-04-15 13:27:23 +02:00 |
|
Benoit Marty
|
68fe0516eb
|
improve preview of this vector drawable
|
2022-04-15 13:18:55 +02:00 |
|
ariskotsomitopoulos
|
d24ba65b5b
|
Enhance user experience when home servers do not support threads.
|
2022-04-15 14:18:38 +03:00 |
|
Benoit Marty
|
a50bf4582c
|
Move "Ignored users" setting section into "Security & Privacy", as per Element Web
|
2022-04-15 13:14:03 +02:00 |
|
Benoit Marty
|
0fbad92e8b
|
ktlint
|
2022-04-15 13:06:53 +02:00 |
|
Benoit Marty
|
cdcf57659f
|
Do not update the cache manually, else the initial sync request will not be triggered.
|
2022-04-15 12:54:04 +02:00 |
|
Benoit Marty
|
a39516534a
|
Initial sync dialog will now come later. It allows to unignore several user without performing an initial sync each time.
|
2022-04-15 12:52:56 +02:00 |
|
Eric Decanini
|
3b454b9ad0
|
Merge pull request #5727 from vector-im/task/eric/current-code-style-config
Adds editorconfig for current code style
|
2022-04-15 12:07:58 +02:00 |
|
Benoit Marty
|
6b9f2965da
|
Request an initial sync when a user is unignored (#1899)
|
2022-04-15 12:07:28 +02:00 |
|
Benoit Marty
|
6ed1516d90
|
Delete messages from just ignored users from our database (#1899)
|
2022-04-15 11:15:08 +02:00 |
|
Benoit Marty
|
ff28cb4349
|
Add TODO
|
2022-04-15 10:41:09 +02:00 |
|
Benoit Marty
|
b6f345aec2
|
Format
|
2022-04-15 10:18:30 +02:00 |
|
Benoit Marty
|
614c2a347c
|
Merge pull request #5768 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.6.20
Bump dokka-gradle-plugin from 1.6.10 to 1.6.20
|
2022-04-15 10:17:31 +02:00 |
|
dependabot[bot]
|
aca653170f
|
Bump dokka-gradle-plugin from 1.6.10 to 1.6.20
Bumps dokka-gradle-plugin from 1.6.10 to 1.6.20.
---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-04-14 23:08:23 +00:00 |
|
Adam Brown
|
e58677a104
|
Merge pull request #5763 from vector-im/feature/adm/server-selection-errors
FTUE - Server selection errors
|
2022-04-14 17:22:58 +01:00 |
|
Benoit Marty
|
6a6f59a3be
|
Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e
Fix sorting of uploads in encrypted rooms
|
2022-04-14 18:11:49 +02:00 |
|
Eric Decanini
|
ace8ae6a37
|
Merge pull request #5766 from vector-im/bugfix/eric/joining-space-landing
Changes destination when joining space to explore space rooms
|
2022-04-14 17:58:31 +02:00 |
|
Adam Brown
|
dc5902e8f5
|
Merge pull request #5737 from vector-im/feature/adm/ftue-captcha
FTUE - Registration Captcha and T&Cs screens
|
2022-04-14 16:42:25 +01:00 |
|
Benoit Marty
|
97f2206f2a
|
Merge pull request #5767 from vector-im/feature/bma/unignore_user
Unignore user must perform an initial sync
|
2022-04-14 17:31:32 +02:00 |
|
Benoit Marty
|
a171a29bf1
|
Merge pull request #5762 from vector-im/feature/bma/dokka_2
Make some data class immutable
|
2022-04-14 17:17:55 +02:00 |
|
Benoit Marty
|
c58b8acdcc
|
Merge pull request #5765 from chagai95/fix-setting-transfer-title
Fix setting transfer title
|
2022-04-14 17:11:09 +02:00 |
|
Adam Brown
|
eda1d9142c
|
using expression bodies for boolean checks
- moves first expression line onto the declaration line
|
2022-04-14 16:10:22 +01:00 |
|
ericdecanini
|
8b893c4106
|
Collapses some named arguments on OpenRoomList startActivity
|
2022-04-14 16:49:32 +02:00 |
|
Benoit Marty
|
b1cff1a5e8
|
Remove unused code
|
2022-04-14 16:47:34 +02:00 |
|
Benoit Marty
|
7b7c509796
|
Changelog
|
2022-04-14 16:47:04 +02:00 |
|
Benoit Marty
|
0bc557640a
|
Perform an initial sync after un-ignoring a user, from the slash command (#3439)
|
2022-04-14 16:45:37 +02:00 |
|
ericdecanini
|
431651ba2f
|
Adds named parameters to OpenRoomList startActivity
|
2022-04-14 16:39:55 +02:00 |
|
Onuray Sahin
|
aa55b1f6b3
|
Merge pull request #5758 from vector-im/feature/ons/live_location_stop_sharing
Live Location Sharing - Update beacon info state event when sharing is ended
|
2022-04-14 17:12:50 +03:00 |
|
Adam Brown
|
47b2ae5dfd
|
updating privacy policy title
|
2022-04-14 14:55:02 +01:00 |
|
Benoit Marty
|
8da5016767
|
Rename val
|
2022-04-14 15:50:58 +02:00 |
|
ericdecanini
|
5b8909b5d2
|
Adds changelog file
|
2022-04-14 15:37:06 +02:00 |
|
Benoit Marty
|
a712ffee68
|
data class
|
2022-04-14 15:34:50 +02:00 |
|