filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,254 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

42 Commits

Author SHA1 Message Date
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36 
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/MessageImageVideoItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-09-10 15:24:40 +02:00
ericdecanini 24509543b9 Replaces feature flag with labs flag 2022-09-06 12:48:03 +02:00
SpiritCroc e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
Adam Brown 19261ab2d0 removing login2 classes 2022-08-15 11:51:13 +01:00
SpiritCroc 5d1722054e Merge tag 'v1.4.32' into sc 
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85

Conflicts:
	.gitignore
	library/ui-styles/src/main/res/values/styles_toolbar.xml
	vector/build.gradle
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/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/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
 2022-08-10 17:07:09 +02:00
Adam Brown 3d207f93f1 removing unused imports and fixing missing full stop on docs 2022-08-02 14:31:46 +01:00
Adam Brown df02f505ad moving git versioning to the buildMeta abstraction 2022-08-02 14:31:46 +01:00
Adam Brown d42c27bfe0 lifting the low privacy build config to the config 2022-08-02 14:31:46 +01:00
Adam Brown 9fe3fc69dd extracting the config models to their own files 2022-08-02 14:31:46 +01:00
Adam Brown b6d052e58d lifting voip setting to a voip config 2022-08-02 14:31:46 +01:00
Adam Brown 56afac26ad creating a location sharing config for holding the map tiler key 2022-08-02 14:31:46 +01:00
Adam Brown 012485b8e3 lifting the live location sharing build flag to the config along with debug toggle 2022-08-02 14:31:46 +01:00
Adam Brown f14aabcd22 ports the key sharing strategy to the config 2022-08-02 14:31:46 +01:00
Adam Brown e795e9da52 porting the onboarding variant selection to the config 2022-08-02 14:31:45 +01:00
Adam Brown 87a8c786f7 moving the voice message limit to the config module 2022-08-02 14:31:24 +01:00
Adam Brown 274b1a149c moving analytics config to the config module, it's now up to forks to opt out rather than relying on the package name to not be vector 2022-08-02 14:31:23 +01:00
SpiritCroc 204e111c1c Merge tag 'v1.4.27-RC2' into merge-v1.4.27 
Change-Id: I6fba3a97a37a4e0a908289272ea9dec2efc85d00

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.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/database/helper/ChunkEntityHelper.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	tmp_sc_fastlane/README.md
	vector-config/src/main/res/values/config.xml
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.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/MergedHeaderItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.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/detail/timeline/reactions/ViewReactionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.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/RoomListSectionBuilderGroup.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
	vector/src/main/res/xml/vector_settings_notifications.xml
 2022-07-09 18:16:33 +02:00
Benoit Marty 49681982ae I have done some manual test, this should be fine. 2022-06-14 16:55:36 +02:00
Benoit Marty 3560ac95d1 Create a Kotlin Config object in vector-config module, for easy configuration. 2022-06-09 10:18:06 +02:00
sim 04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +02:00
SpiritCroc 4f60963741 Merge tag 'v1.4.16' into sc 
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-05-18 09:59:01 +02:00
Ahmed Radhouane Belkilani 6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc 
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.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/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.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/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.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/helper/TimelineControllerInterceptorHelper.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/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2022-05-05 17:41:26 +02:00
SpiritCroc d44cb85dc7 Merge tag 'v1.4.12' into sc 
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	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/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.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/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.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/layout/item_space_beta_header.xml
 2022-04-24 11:15:52 +02:00
Benoit Marty a50bf4582c Move "Ignored users" setting section into "Security & Privacy", as per Element Web 2022-04-15 13:14:03 +02:00
aringenbach 047a45d77f
Add a setting to be able to always appear offline (#5583) 
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
 2022-04-12 12:08:56 +02:00
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
Adam Brown 5f9d3e107d moving ftue ems url to the urls config file 2022-04-08 13:17:56 +01: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