Commit graph

13351 commits

Author SHA1 Message Date
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
ariskotsomitopoulos
10599aa728 ktlint format 2022-01-18 13:11:52 +02:00
Benoit Marty
e8d71feef1
Merge pull request #4973 from vector-im/feature/adm/ftue-other-sso-crash
Fixing onboarding crash when signing in/up on non `matrix.org` server with SSO
2022-01-18 12:09:14 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji.
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
Adam Brown
54a5c3e52a adding changelog entry 2022-01-18 10:51:55 +00:00
Adam Brown
114c60cfed fixing onboarding crash when signing in/up with sso -
handles the sso flows by not forwarding to the signin/signup pages and instead using the previous onLoginFlowRetrieved when the selected server type is other
2022-01-18 10:51:54 +00:00
Onuray Sahin
ede1fe39fc Disable location sharing from build settings. 2022-01-18 13:41:40 +03:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.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/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
Onuray Sahin
42dcf52eb0 Use official maptiler key. 2022-01-18 12:34:02 +03:00
Benoit Marty
f5b16b834c Changelog 2022-01-18 09:20:08 +01:00
Benoit Marty
961f821ab9 Create and use removeIfCompat (#4961) 2022-01-18 09:19:52 +01:00
Benoit Marty
13881a589a Remove temporary change on the "NewApi" lint error. 2022-01-18 09:17:51 +01:00
Benoit Marty
a083047888 Fix typo 2022-01-18 09:12:39 +01:00
ganfra
cc89a8fc77 Timeline : fix 4959 2022-01-18 09:11:55 +01:00
Bui Minh Duc
19a3eef137 Translated using Weblate (Vietnamese)
Currently translated at 99.1% (2707 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2022-01-17 19:26:47 +00:00
Johan Smits
039e1dd6ad Translated using Weblate (Dutch)
Currently translated at 93.5% (2553 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-01-17 19:26:47 +00:00
Linerly
67b2e8378a Translated using Weblate (Indonesian)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-01-17 19:26:11 +00:00
Priit Jõerüüt
cce8234c6f Translated using Weblate (Estonian)
Currently translated at 99.9% (2727 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2022-01-17 19:26:11 +00:00
Felix
5ce2d4bcd3 Translated using Weblate (German)
Currently translated at 98.9% (2700 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-01-17 19:26:10 +00:00
ganfra
7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Benoit Marty
23eb8ead4f Add case for local or non public homeserver. 2022-01-17 16:30:43 +01:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
Benoit Marty
e2e3f72564 Merge branch 'develop' into feature/bca/fix_switch_space_on_tap_notif 2022-01-17 15:28:56 +01:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix
Avoid deleting sent messages on non room events
2022-01-17 15:26:46 +01:00
Benoit Marty
c59bb5740a Add comment after merge of #4952 2022-01-17 15:24:51 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2
Force HTTP/1.1
2022-01-17 15:20:23 +01:00
ariskotsomitopoulos
f6067977fe Refactor ThreadMessagingTest 2022-01-17 14:27:30 +02:00
ariskotsomitopoulos
b343739a71 Enhance decrypted thread summary to return poll questions 2022-01-17 14:27:17 +02:00
ariskotsomitopoulos
5b786e5749 Remove duplicate RetryTestRule 2022-01-17 14:26:39 +02:00
ariskotsomitopoulos
52348e399e ktlint fixes 2022-01-17 13:30:59 +02:00
ariskotsomitopoulos
879c4ffef6 Improve logic 2022-01-17 13:00:34 +02:00
Benoit Marty
ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-17 11:59:23 +01:00
ariskotsomitopoulos
01ade64f3b fix ktlint format 2022-01-17 12:27:53 +02:00
ariskotsomitopoulos
493374c423 Add changelog 2022-01-17 12:21:22 +02:00
ariskotsomitopoulos
3656896af9 Avoid deleting sent messages on non room events 2022-01-17 12:13:01 +02:00
Adam Brown
1528238a2f adding changelog entry 2022-01-17 09:27:04 +00:00
Adam Brown
7d0b833aa5 using app name template for the carousel content which contains the app name
- also marks the now unused strings for deletion
2022-01-17 09:24:53 +00:00
Adam Brown
be319f596d fixing pixel rounding to 451x451, image should be 450x450 2022-01-17 09:24:53 +00:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
43acc7a6f8 adding dark variants of the carousel images 2022-01-17 09:24:53 +00:00
Adam Brown
c0b855e7c7 adding non light mode carousel background which uses a vertical gradient 2022-01-17 09:24:53 +00:00
Adam Brown
982b480613 including updated copy for the carousel
- marked as donottranslate whilst waiting for sign off
- removed the positioning from the naming schema in favour of location of context
2022-01-17 09:24:53 +00:00
Adam Brown
fbe60f5a52 applying english override for the last carousel page copy 2022-01-17 09:24:53 +00:00
Adam Brown
b137009e6e replacing onboarding vectors with png to avoid performance overheads
- also fixes the carousel text reposition based on line count
2022-01-17 09:24:53 +00:00
Adam Brown
e521fd9059 fixing typo in carousel body 2022-01-17 09:24:53 +00:00
Adam Brown
bb2e3b1078 splitting the CharSequence creation from the conversion to EpoxyCharSequence 2022-01-17 09:24:53 +00:00
Adam Brown
7c5e7a902d updating splash carousel copy to match latest copy 2022-01-17 09:24:53 +00:00