e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +02:00
f8084dc2e2
[TMP] Automatic upstream merge preparation
...
Change-Id: If4581aa8e4f43b4963a3ed44313f7dd1d00d7581
2021-07-05 10:32:08 +02:00
a4ba5998e1
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I145b127da93a119944cdd13879644787c875a52e
2021-07-05 10:32:08 +02:00
2da0379505
Merge branch 'release/1.1.12' into main
2021-07-05 09:57:57 +02:00
9673b3b15b
Release: fastlane
2021-07-05 09:56:27 +02:00
09e362ec6b
Release: towncrier
2021-07-05 09:55:22 +02:00
76f4c81d2d
Hide password... Oups
2021-07-05 09:50:20 +02:00
24a61ee0ff
Display-name coloring setting
...
Based on whether a chat is
- DM
- Room
- Public room
allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)
The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.
Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
2021-07-04 17:01:27 +02:00
a0adb8c9bd
Update README
...
Change-Id: If26d9ac0adea3202e2322801fb7a45f75f680ac5
2021-07-04 14:35:42 +02:00
1eee4f3dca
Delete empty video.txt fastlane files
...
These show up as untranslated on weblate
Change-Id: I13860a93b5b2d2dc8bae1b9b7322a517809ae99d
2021-07-04 12:42:03 +02:00
eb051f1b29
Small update to the store description
...
Upstream now can follow system dark/light theme as well, but we have
more settings!
Change-Id: If4a18e48302ddfeeabbb4e96795a611809c3dba0
2021-07-04 12:15:04 +02:00
1ba30d4bdb
Increment version
...
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
2021-07-04 11:52:31 +02:00
2d860eaa2a
Merge pull request #3622 from vector-im/feature/bma/crash_realm
...
CryptoStore migration has to be object to avoid crash
2021-07-03 20:08:57 +02:00
ba6fd96623
Fix some corner case where a wrong display name would show
...
Scenario: Scroll to a message in dual side bubble layout that:
- Is an image, i.e. has a time footer overlay
- Was sent by the user
- Was sent in a group chat, i.e. other messages show sender display
names
This scenario could lead to the non-bubble name view not being cleared
nor hidden correctly.
Change-Id: I033d3070612d219dea9f2181c5029e17460c3ee6
2021-07-03 15:34:34 +02:00
fe1fc098c8
Disable "long click on room" "help"
...
Change-Id: I851092f89131b531e5e0e94e405bb2769f84dbb0
2021-07-02 18:35:15 +02:00
1c32fcad35
Profile screen theme tweaks
...
Change-Id: I0dfeea8284ae597b03c6e9fd8c1f2f1e4f45332f
2021-07-02 18:33:42 +02:00
2513be744c
CryptoStore migration has to be object to avoid crash
...
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
2021-07-02 17:29:44 +02:00
2a0230633d
Merge pull request #3620 from vector-im/feature/bma/fix_wl
...
Fix compilation issue
2021-07-02 17:29:04 +02:00
2c7b947d27
Fix compilation issue
...
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 15:32:01 +02:00
4b472f041b
Merge remote-tracking branch 'weblate/sc' into sc
...
Change-Id: If195307eec194931f2ec1980dbf23d0b45d18a32
2021-07-02 15:23:09 +02:00
b808d8b464
Avoid chat position jumps during message loading
...
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message
With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.
Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
2021-07-02 15:19:20 +02:00
f06d2b1734
Fix typo
2021-07-02 14:55:30 +02:00
1eea734a4c
Fix compilation issue
...
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
2021-07-02 12:53:00 +02:00
dc50246ec4
Merge pull request #3618 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2021-07-02 10:25:45 +02:00
64b6779cfa
Merge branch 'origin/develop' into Weblate.
2021-07-02 07:52:44 +00:00
b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility
...
Fix some issues with timeline cache invalidation and visibility.
2021-07-02 09:40:37 +02:00
d4009476f9
Cleanup
2021-07-02 09:39:32 +02:00
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild
...
Fix / dm flattenParents always growing
2021-07-02 09:35:51 +02:00
1906fbdeaa
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (2490 of 2490 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-07-02 01:04:01 +00:00
adcd1a64df
empty migration to fix big flattenParentIds for DM
2021-07-01 15:28:26 +02:00
69c399a229
Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application
...
Apply Google Services Gradle plugin more robustly
2021-07-01 10:16:00 +02:00
a8bef415b7
Merge pull request #3587 from vector-im/feature/fga/fix_video_call_crash
...
Fix crash after video call
2021-06-30 17:22:09 +02:00
de64df3cdb
Fix crash after video call
2021-06-30 14:50:30 +02:00
24fe43e267
Translated using Weblate (French)
...
Currently translated at 27.7% (15 of 54 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
2021-06-30 13:07:58 +02:00
265806b190
Translated using Weblate (Lithuanian)
...
Currently translated at 100.0% (54 of 54 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/lt/
2021-06-30 13:07:58 +02:00
b9749f0260
Translated using Weblate (German)
...
Currently translated at 100.0% (54 of 54 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
2021-06-30 13:07:58 +02:00
b78a1768e8
Translated using Weblate (Czech)
...
Currently translated at 100.0% (54 of 54 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2021-06-30 13:07:58 +02:00
b18bf89934
Added translation using Weblate (French)
2021-06-30 13:07:58 +02:00
1a0f29ff94
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (2490 of 2490 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2021-06-30 10:34:47 +00:00
c350c94827
Translated using Weblate (German)
...
Currently translated at 99.9% (2488 of 2490 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2021-06-30 10:34:47 +00:00
a5b09b9dc3
change log
2021-06-29 17:38:48 +02:00
4e9ab0c6f9
Fix message highlight color behind bubbles for SC themes
...
Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
2021-06-29 16:46:23 +02:00
559016cd32
SC theme improvements after merge, pt. 3
...
Change-Id: I506d0bc3a320508268646ba86d93fb39e2ad8168
2021-06-29 15:06:45 +02:00
1d8b95560b
Fix / dm flattenParents always growing
2021-06-29 14:57:43 +02:00
3a683fc4e9
Merge pull request #3578 from vector-im/feature/bma/button_size
...
Fix issue on button styles
2021-06-29 09:48:20 +02:00
dab04d52fd
More SC theme improvements, including a reworked light theme
...
Change-Id: I373daedc45bee3aa9e24e09bb632b01e27754010
2021-06-28 18:28:41 +02:00
bca220f909
Fix issue on button styles
2021-06-28 17:02:06 +02:00
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign
...
Jump to unread: implement new design
2021-06-28 16:45:06 +02:00
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite
...
Feature/fga/auto accept invite
2021-06-28 16:40:10 +02:00
48fa9e1a5e
Clean after benoits review
2021-06-28 11:00:29 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
Weblate
lvre
Valere
ganfra
J. Lavoie
Govindas
waclaw66
libexus