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 |
|
Onuray Sahin
|
6c65b0a9e0
|
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list
[Devices Management] Header view for sessions lists in new layout (PSG-668)
|
2022-08-15 23:09:53 +03:00 |
|
Nikita Fedrunov
|
e0e21d4282
|
filtered room list at home (#6724)
|
2022-08-11 16:26:24 +02:00 |
|
Maxime NATUREL
|
8f218ce773
|
Custom header view without "Learn more"
|
2022-08-11 12:11:14 +02: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 |
|
ericdecanini
|
1bf36dce92
|
Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab
|
2022-08-05 17:11:00 +02:00 |
|
Maxime NATUREL
|
6972622bc6
|
Handling map loading error in timeline
|
2022-08-04 16:58:28 +02:00 |
|
Eric Decanini
|
e2ed4b4ae1
|
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar
New App Layout Toolbar
|
2022-08-02 17:44:53 +02:00 |
|
Maxime NATUREL
|
c616229d53
|
Missing renaming of stylable file
|
2022-08-02 09:09:19 +02:00 |
|
Maxime NATUREL
|
be696f5a5c
|
Align naming of components for the live location feature
|
2022-08-02 09:09:19 +02:00 |
|
SpiritCroc
|
9b44975635
|
Merge tag 'v1.4.30' into sc
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510
Conflicts:
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/model/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/AutoCompleter.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/item/DefaultLiveLocationShareStatusItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.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/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/home/room/list/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.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/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/res/xml/vector_settings_labs.xml
|
2022-07-29 16:55:28 +02:00 |
|
ericdecanini
|
d49f104332
|
Adds fab buttons
|
2022-07-28 15:09:57 +02:00 |
|
ericdecanini
|
7334d909d5
|
Adds options menu
|
2022-07-26 16:00:46 +02:00 |
|
ericdecanini
|
5958559186
|
Styles collapsed title text
|
2022-07-26 14:31:02 +02:00 |
|
ericdecanini
|
3df337fa07
|
Adds new layout toolbar
|
2022-07-26 12:38:29 +02:00 |
|
Maxime NATUREL
|
e1ea10e0a2
|
Adding attribute to set the start margin of icon
|
2022-07-25 14:17:07 +02:00 |
|
Maxime NATUREL
|
5e59eb474a
|
Adding attribute to control alpha of the banner background
|
2022-07-25 10:36:28 +02:00 |
|
Maxime NATUREL
|
6b403ec224
|
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
|
2022-07-18 10:43:43 +02:00 |
|
Nikita Fedrunov
|
79762d9133
|
font scale setting screen (#6453)
|
2022-07-18 09:49:57 +02:00 |
|
Maxime NATUREL
|
cda100e596
|
Using same string key for stop + fix insets in button styles
|
2022-07-18 09:43:33 +02:00 |
|
SpiritCroc
|
dec61e7a35
|
Merge tag 'v1.4.28' into merge-v1.4.28
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10
Conflicts:
fastlane/README.md
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.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/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
|
2022-07-17 18:52:55 +02:00 |
|
SpiritCroc
|
9ef870b927
|
[merge] Live location theming
Change-Id: Ia10af41b946cb5913ce6805095354d23ac3ca251
|
2022-07-09 21:20:25 +02: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
|
aae6e20f9c
|
Migration to activity 1.5.0. Rework menu management
|
2022-07-01 17:06:02 +02:00 |
|
Adam Brown
|
c603b780cf
|
extracting common breaker background selection to ftue extensions
|
2022-06-29 17:47:28 +01:00 |
|
Benoit Marty
|
29d4916a2e
|
Cleanup of #5187 (#6326)
Update design and behaviour on widget permission bottom sheet
|
2022-06-22 15:04:02 +02:00 |
|
Jorge Martín
|
b5aedd4626
|
Re-implement lock screen feature using our own implementation.
|
2022-06-20 17:38:05 +02:00 |
|
SpiritCroc
|
89f129c657
|
Material red for warnings and errors in SC themes
Change-Id: Ic7f8550f4a15b8128b4c6c83fb9f8aa3498c915e
|
2022-06-07 18:28:03 +02:00 |
|
Onuray Sahin
|
b455bf04aa
|
Create new styles for map view copyright text.
|
2022-06-07 15:07:41 +03:00 |
|
SpiritCroc
|
49663a1154
|
Merge tag 'v1.4.18' into sc
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5
Conflicts:
dependencies.gradle
library/attachment-viewer/build.gradle
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/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/utils/Emoji.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/timeline/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.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/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/res/xml/vector_settings_labs.xml
|
2022-06-01 13:54:34 +02:00 |
|
Onuray Sahin
|
4ccd242cbf
|
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet
Live Location Sharing - User List Bottom Sheet [PSF-890]
|
2022-05-30 21:07:25 +03:00 |
|
Onuray Sahin
|
453aa28380
|
Add required resources.
|
2022-05-27 15:25:59 +03:00 |
|
Olivér Falvai
|
9ce9ad6d3a
|
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
|
2022-05-26 14:04:39 +02:00 |
|
Benoit Marty
|
fd252dbaff
|
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale
Use fixed text size in read receipt counter
|
2022-05-23 13:41:03 +02:00 |
|
Adam Brown
|
8a53eafa72
|
adding gradient background to the waiting for verification screen, matching designs
- renames drawable which redirects to the attribute colorBackground
|
2022-05-20 12:11:44 +01:00 |
|
Olivér Falvai
|
f036d35829
|
Merge branch 'develop' into dependency-cleanup
|
2022-05-19 12:27:09 +02:00 |
|
Maxime NATUREL
|
738ce18a2f
|
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
[Location sharing] - Message for live sharing in timeline (PSF-884)
|
2022-05-18 15:39:51 +02:00 |
|
Olivér Falvai
|
2dcc120cf7
|
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
# Conflicts:
# build.gradle
# dependencies.gradle
|
2022-05-18 11:47:21 +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 |
|
Benoit Marty
|
57ae714cbe
|
Merge pull request #6072 from vector-im/feature/bma/fix_typing
Feature/bma/fix typing
|
2022-05-17 15:34:15 +02:00 |
|
Benoit Marty
|
2e189a1ab0
|
Fix typing rendering #6063
|
2022-05-17 11:53:44 +02:00 |
|
ariskotsomitopoulos
|
324856d700
|
Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
|
2022-05-17 11:55:07 +03:00 |
|
Benoit Marty
|
afd2804ed3
|
Merge branch 'develop' into feature/mna/PSF-884-location-view
|
2022-05-16 14:42:38 +02:00 |
|
ariskotsomitopoulos
|
72a945ac13
|
PR remarks
|
2022-05-16 13:32:30 +03:00 |
|
chagai95
|
9f033ed623
|
add presence indicator busy and away
|
2022-05-13 13:55:10 +02:00 |
|
Maxime NATUREL
|
bbec3a7c2e
|
Integration into location message item
|
2022-05-09 15:15:33 +02:00 |
|
Maxime NATUREL
|
df1ba8ec88
|
Custom view for the banner
|
2022-05-09 15:15:33 +02:00 |
|
ariskotsomitopoulos
|
c5fc1e579d
|
Add badge in thread list filtering
|
2022-05-04 19:24:31 +03:00 |
|
ariskotsomitopoulos
|
4b746ee345
|
Reduce thread list menu icon size
|
2022-05-04 13:55:53 +03:00 |
|
Olivér Falvai
|
042ec3628f
|
Extract text size to style
|
2022-04-28 19:02:48 +02:00 |
|