Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,584 Commits 530 Branches 158 Tags 486 MiB
8788fb974d
Commit Graph

13584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Marty
e9b9406bf1 Rework the location code - WIP 2022-01-27 21:11:31 +01:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ganfra
ed9adf8367 Bubbles: fix paddings 2022-01-27 18:18:39 +01:00
ganfra
881b063d45 Bubbles: remove emote from bubble (keep right/left alignment) 2022-01-27 18:18:29 +01:00
ganfra
4de421d663 Timeline html rendering: better reply and pill 2022-01-27 18:17:56 +01:00
ganfra
a9fe21e583 Timeline html rendering: handle code tags 2022-01-27 18:17:23 +01:00
ariskotsomitopoulos
78dfac52a7 ktlint format 2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
bac6d271ca Merge develop into this branch 2022-01-27 18:13:05 +02:00
Benoit Marty
e3242f0deb Prevent the dialog from being cancellable, since OK button finish the Activity. 2022-01-27 16:40:49 +01:00
David Langley
a5df52ce28
Update changelog.d/5081.bugfix 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-01-27 15:39:47 +00:00
David Langley
f449b99548 lint 2022-01-27 15:24:39 +00:00
Benoit Marty
db3f60b4b1 Inform the user when the location provider is disabled. 2022-01-27 16:23:39 +01:00
David Langley
3ecc73b42a remove line break 2022-01-27 15:19:08 +00:00
Benoit Marty
7242f1c2f1 Fix a crash when disabling the location on the device 
`LocationListener` does not have default implementation for some methods for Android versions below R
 2022-01-27 16:18:40 +01:00
David Langley
79b11623b5 Call transfer should put other side on hold while the transfer is being selected and unhold when the user cancels selection. 2022-01-27 15:16:46 +00:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
ariskotsomitopoulos
b83872d5f0 When show all threads developer mode option is enabled, prevent reply in thread to those events 2022-01-27 16:38:14 +02:00
Benoit Marty
ff6810f1f4
Merge pull request #5062 from vector-im/feature/bma/location_sharing_fix 
Ensure mapbox legal mention are displayed on the map
 2022-01-27 15:35:52 +01:00
Linerly
0f0ad7ddd3 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-01-27 14:26:52 +00:00
waclaw66
9b843f39af Translated using Weblate (Czech) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2022-01-27 14:26:51 +00:00
Jeff Huang
40e70bb461 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-01-27 14:26:50 +00:00
random
79bea3b9eb Translated using Weblate (Italian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2022-01-27 14:26:48 +00:00
Priit Jõerüüt
71a7f45ff1 Translated using Weblate (Estonian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-01-27 14:26:47 +00:00
Ihor Hordiichuk
f964721d8e Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2022-01-27 14:26:46 +00:00
lvre
090d620cbf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2022-01-27 14:26:44 +00:00
Jeff Huang
bce49e04cd Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-01-27 14:26:43 +00:00
Ihor Hordiichuk
d31818c1b3 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-01-27 14:26:40 +00:00
Besnik Bleta
6ceb2c4824 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2738 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2022-01-27 14:26:37 +00:00
lvre
f4af074148 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-01-27 14:26:34 +00:00
random
2c50cd16b1 Translated using Weblate (Italian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-01-27 14:26:31 +00:00
Linerly
5319f03592 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-01-27 14:26:28 +00:00
Paragoumba
2f96b6ef55 Translated using Weblate (French) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-01-27 14:26:25 +00:00
Danial Behzadi
4a799786f5 Translated using Weblate (Persian) 
Currently translated at 99.3% (2733 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-01-27 14:26:22 +00:00
Priit Jõerüüt
8f288990de Translated using Weblate (Estonian) 
Currently translated at 99.9% (2750 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-01-27 14:26:20 +00:00
artevaeckt
0d29859fab Translated using Weblate (German) 
Currently translated at 99.2% (2732 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-27 14:26:17 +00:00
waclaw66
f1288e53b1 Translated using Weblate (Czech) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-01-27 14:26:15 +00:00
Benoit Marty
2e36ca5650
Merge pull request #5070 from vector-im/feature/bma/test_screens 
Test screens in the settings
 2022-01-27 14:21:10 +01:00
Benoit Marty
c6ee513ba1
Merge pull request #5069 from vector-im/feature/ons/fix_end_poll 
Allow ending polls if user created it
 2022-01-27 14:09:18 +01:00
ariskotsomitopoulos
554ece724e - Remove counter from thread notifications 
- Fix red dot on user mentioning
 2022-01-27 14:55:34 +02:00
ariskotsomitopoulos
f53b711e0d When thread disabled add thread replies within threads ( to the users with threads enabled ) 2022-01-27 13:49:03 +02:00
ariskotsomitopoulos
358a7d0ec4 Handle latest thread message & root thread edition to update thread summary and thread list appropriately 2022-01-27 13:22:04 +02:00
Benoit Marty
1518a08c29 Fix towncrier mistake due to file extension change 2022-01-27 12:17:25 +01:00
Benoit Marty
eacdf7f55d
Merge pull request #5071 from vector-im/feature/bma/wording 
Instruction for the next weblate sync
 2022-01-27 10:00:03 +01:00
Benoit Marty
590f4bee25
Merge pull request #5073 from vector-im/feature/adm/instrumentation-modification-error 
Fixing concurrent modification espresso errors
 2022-01-27 09:59:24 +01:00
Onuray Sahin
2ad7a020cf Current user is not a king to end polls, check event sender id instead. 2022-01-27 00:00:29 +03:00
Adam Brown
19a46afe7b untracking activities during espresso runs as soon as they're idle 
- Sometimes activities are instantly idle without going through the lifecycleChanged callback which means we were registering callsbacks which were duplicated and triggering for later waits
 2022-01-26 18:47:24 +00:00
Adam Brown
cbdeb54fdb using md5 hash of the userId to normalise the usage as a key 2022-01-26 18:43:09 +00:00
Benoit Marty
6c79be1c68 Instruction for the next weblate sync 2022-01-26 18:16:35 +01:00
Benoit Marty
891367752b Test the legals screen (#4709) 2022-01-26 18:00:49 +01:00