SpiritCroc
|
e3a32334c8
|
Add schildi.chat to suggested room directory servers
Change-Id: Id488d51aba7d4bcca9a24f262f0d88a5ff895ab5
|
2022-04-12 11:58:34 +02:00 |
|
SpiritCroc
|
b8057930c8
|
[merge] Disable threads feedback
Change-Id: Icd139b1a54519ff276e8d5ef40accd38cf5fadef
|
2022-04-12 11:57:37 +02:00 |
|
SpiritCroc
|
7c35f5fda5
|
Merge tag 'v1.4.11' into sc
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d
Conflicts:
dependencies_groups.gradle
library/ui-styles/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/AndroidManifest.xml
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/res/menu/menu_timeline.xml
|
2022-04-12 11:57:16 +02:00 |
Benoit Marty
|
0f14652932
|
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply
Threads Beta opt-in mechanism
|
2022-04-05 20:40:16 +02:00 |
ariskotsomitopoulos
|
eecaf9602d
|
Add urls.xml in vector-config
|
2022-04-05 14:12:32 +03:00 |
|
SpiritCroc
|
d5d555d07f
|
Merge tag 'v1.4.8' into merge-v1.4.8
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
library/ui-styles/src/main/res/values/styles_buttons.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
vector/src/main/res/drawable/ic_home_bottom_catchup.xml
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
vector/src/main/res/layout/fragment_ftue_account_created.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
vector/src/main/res/layout/view_attachment_type_selector.xml
vector/src/main/res/layout/view_room_detail_toolbar.xml
vector/src/main/res/menu/menu_submit.xml
|
2022-03-30 15:53:51 +02:00 |
|
ariskotsomitopoulos
|
9eccb9eaa0
|
Enable threads beta feedback
|
2022-03-28 13:59:59 +03:00 |
|
ariskotsomitopoulos
|
a2e2cdc2f3
|
Add feature specific configurations
|
2022-03-28 13:54:31 +03:00 |
|
ariskotsomitopoulos
|
2ca3387ab3
|
Migrate Threads and notify user
|
2022-03-17 18:51:54 +01:00 |
|
SpiritCroc
|
f5afdefe2f
|
Merge tag 'v1.4.4' into sc
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
|
2022-03-10 13:26:09 +01:00 |
Benoit Marty
|
0087f72309
|
Improve doc
|
2022-02-23 18:28:08 +01:00 |
|
Benoit Marty
|
03a6a348c0
|
Add boolean for visibility of all settings at root level
|
2022-02-23 18:19:24 +01:00 |
|
Benoit Marty
|
830fca731c
|
Move setting for preference in a dedicated file
|
2022-02-23 18:10:56 +01:00 |
|
Benoit Marty
|
96c2c6f4a4
|
Move file config.xml to the module vector-config
|
2022-02-23 18:10:08 +01:00 |
|
Benoit Marty
|
e3209fd04a
|
Create module vector-config
|
2022-02-23 18:08:04 +01:00 |