SpiritCroc
|
6c06462ec9
|
Merge tag 'v1.1.8' into sc
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
|
2021-05-26 10:44:19 +02:00 |
|
SpiritCroc
|
1b6ddb5949
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ib94348dd875279692a53465e4b4d13cfdbb27e16
|
2021-05-26 08:48:19 +02:00 |
|
Benoit Marty
|
03496c36dc
|
Fix lint issue
|
2021-05-25 15:29:38 +02:00 |
|
Weblate
|
1cc2e8b000
|
Merge branch 'origin/develop' into Weblate.
|
2021-05-25 11:06:53 +00:00 |
|
B.O.S.S
|
cc8182445e
|
Translated using Weblate (Polish)
Currently translated at 85.3% (2094 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
|
2021-05-25 11:06:46 +00:00 |
|
Ngô Ngọc Đức Huy
|
089566b5d9
|
Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
|
2021-05-25 11:06:43 +00:00 |
|
Dat Ng
|
f2c7b6508a
|
Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
|
2021-05-25 11:06:43 +00:00 |
|
Quang Trung
|
3301df44fb
|
Translated using Weblate (Vietnamese)
Currently translated at 21.5% (529 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
|
2021-05-25 11:06:43 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
9546889236
|
Translated using Weblate (Romanian)
Currently translated at 6.8% (167 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-25 11:06:39 +00:00 |
|
waclaw66
|
d99ac94bf9
|
Translated using Weblate (Czech)
Currently translated at 100.0% (2454 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
|
2021-05-25 11:06:39 +00:00 |
|
Hivaa
|
552d763f83
|
Translated using Weblate (Persian)
Currently translated at 100.0% (2454 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
|
2021-05-25 11:06:38 +00:00 |
|
LinAGKar
|
3e1631c0e5
|
Translated using Weblate (Swedish)
Currently translated at 100.0% (2454 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
|
2021-05-25 11:06:36 +00:00 |
|
SpiritCroc
|
c97024ee3c
|
rageshake: Remove useless title addition in issue title
Change-Id: I56de1ae9dbd9a569504d7ef1a5c66efd1ad414b2
|
2021-05-25 11:28:03 +02:00 |
|
SpiritCroc
|
d527e2039c
|
Rageshake: add label "can contact"
Change-Id: I76eafb3b65ff76f531e577b9693dff25f2c3f878
|
2021-05-25 11:25:57 +02:00 |
|
SpiritCroc
|
95b5efe3f4
|
Disable missed space beta feedback
Change-Id: Ia6813fd5d8575f7ba1b682ba79bce0138fce5f20
|
2021-05-25 11:15:17 +02:00 |
|
Benoit Marty
|
b44c1a1c77
|
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi
Feature/fga/authenticated jitsi
|
2021-05-25 10:24:54 +02:00 |
|
tanmatsu
|
8e45b69c7d
|
Translated using Weblate (Romanian)
Currently translated at 6.6% (163 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-22 21:34:37 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
edc2e7e61e
|
Translated using Weblate (Romanian)
Currently translated at 6.6% (163 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-22 21:34:37 +00:00 |
|
SpiritCroc
|
27cedd62d1
|
Limit picture upscale factor
Change-Id: I11ea154db505d352ba19d0dbba57c915e3c1d458
|
2021-05-22 14:55:48 +02:00 |
|
SpiritCroc
|
4f46f470d6
|
Increment version
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
|
2021-05-22 10:12:03 +02:00 |
|
tanmatsu
|
b034870242
|
Translated using Weblate (Romanian)
Currently translated at 4.0% (99 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 19:15:45 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
5ec1ab5b2d
|
Translated using Weblate (Romanian)
Currently translated at 4.0% (99 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 19:15:43 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
fd8295eb6c
|
Translated using Weblate (Romanian)
Currently translated at 2.7% (67 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:53:49 +00:00 |
|
tanmatsu
|
67ec1b4434
|
Translated using Weblate (Romanian)
Currently translated at 2.7% (67 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:53:49 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
509b0f5a41
|
Translated using Weblate (Romanian)
Currently translated at 2.2% (56 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:51:22 +00:00 |
|
tanmatsu
|
3a5724d900
|
Translated using Weblate (Romanian)
Currently translated at 2.2% (56 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:51:22 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
7e7d245d59
|
Translated using Weblate (Romanian)
Currently translated at 2.2% (55 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:50:59 +00:00 |
|
tanmatsu
|
b6cbd76849
|
Translated using Weblate (Romanian)
Currently translated at 2.2% (55 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:50:59 +00:00 |
|
Viorel-Cătălin Răpițeanu
|
d50a8a9d06
|
Translated using Weblate (Romanian)
Currently translated at 2.1% (52 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:50:04 +00:00 |
|
tanmatsu
|
7eb27e3633
|
Translated using Weblate (Romanian)
Currently translated at 2.1% (52 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:50:04 +00:00 |
|
tanmatsu
|
d750c40ceb
|
Translated using Weblate (Romanian)
Currently translated at 1.3% (32 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
|
2021-05-21 17:44:29 +00:00 |
|
Benoit Marty
|
6706a88a21
|
Merge pull request #3188 from vector-im/feature/bma/login_v2
Login v2 - WIP
|
2021-05-21 14:55:22 +02:00 |
|
Benoit Marty
|
40bb58c9cb
|
Merge branch 'develop' into feature/bca/fix_3371
|
2021-05-21 14:53:21 +02:00 |
|
Benoit Marty
|
697b9ff535
|
Merge branch 'develop' into feature/bca/spaces_quick_fixes
|
2021-05-21 14:49:12 +02:00 |
|
Jeff Huang
|
c06d8dccb7
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2454 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
|
2021-05-21 12:34:37 +00:00 |
|
Quang Trung
|
0df7166954
|
Translated using Weblate (Vietnamese)
Currently translated at 19.1% (469 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
|
2021-05-21 12:34:36 +00:00 |
|
Vancha
|
3af3641b92
|
Translated using Weblate (Frisian)
Currently translated at 24.8% (609 of 2454 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
|
2021-05-21 12:34:35 +00:00 |
|
Valere
|
ba96626bd0
|
Code review
|
2021-05-21 11:46:55 +02:00 |
|
Benoit Marty
|
048c13af50
|
Fix issue after rebase
|
2021-05-21 11:46:28 +02:00 |
|
Valere
|
2f3f0c294c
|
Code review
|
2021-05-21 11:46:28 +02:00 |
|
Valere
|
ae5a5ec92b
|
Spaces | Personal spaces add DM - Web Parity #3271
|
2021-05-21 11:46:13 +02:00 |
|
Valere
|
abf7e275a7
|
Fix / Improve 'Leave Space' UX/UI #3359
|
2021-05-21 11:46:13 +02:00 |
|
Valere
|
8d3167cb66
|
Code review
|
2021-05-21 11:42:01 +02:00 |
|
Valere
|
cb6f414c60
|
Fix | Explore room list: the RoomId is displayed instead of name (#3371)
|
2021-05-21 11:40:09 +02:00 |
|
Benoit Marty
|
0424d03bcc
|
Fix lint and tools issue
|
2021-05-21 11:37:16 +02:00 |
|
Valere
|
bcf755407b
|
code review
|
2021-05-21 11:37:16 +02:00 |
|
Valere
|
1b16d287e8
|
review
|
2021-05-21 11:34:51 +02:00 |
|
Valere
|
0d0b6a8810
|
Fix empty states for spaces
|
2021-05-21 11:32:34 +02:00 |
|
SpiritCroc
|
d0579cb59b
|
Which user expects spaces to be sorted by id? Use the display name
Change-Id: Ic843ca00bef6dcbf0eac2c4931dea7668c9edc04
|
2021-05-21 09:56:17 +02:00 |
|
ganfra
|
03f81258c4
|
Jitsi auth: clean after Benoits review
|
2021-05-20 20:16:37 +02:00 |
|