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 |
|
Benoit Marty
|
38641c88b7
|
Fix usage of System.currentTimeMillis().
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
|
2022-05-18 20:51:41 +02:00 |
|
Benoit Marty
|
12644e9915
|
Merge pull request #5947 from vector-im/feature/bma/renaming
Small changes
|
2022-05-18 16:27:48 +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
|
388e35e828
|
Remove even more deps
|
2022-05-18 14:19:11 +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 |
|
Benoit Marty
|
12eb23b198
|
Merge branch 'develop' into feature/bma/detekt_end_period
|
2022-05-16 13:14:37 +02:00 |
|
ariskotsomitopoulos
|
72a945ac13
|
PR remarks
|
2022-05-16 13:32:30 +03:00 |
|
Benoit Marty
|
90035de5f2
|
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
add presence indicator busy and away
|
2022-05-16 11:26:11 +02:00 |
|
Benoit Marty
|
4c95aafe10
|
Detekt: enable and fix EndOfSentenceFormat
|
2022-05-16 08:54:07 +02:00 |
|
chagai95
|
9f033ed623
|
add presence indicator busy and away
|
2022-05-13 13:55:10 +02:00 |
|
Benoit Marty
|
c19563bed2
|
Detekt: fix UtilityClassWithPublicConstructor
|
2022-05-12 17:26:11 +02:00 |
|
ariskotsomitopoulos
|
40de685f1a
|
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
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
|
2022-05-12 14:41:38 +03:00 |
|
Benoit Marty
|
04cadb94cf
|
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
|
2022-05-10 18:23:51 +02:00 |
|
Benoit Marty
|
c04655cd36
|
Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead
|
2022-05-09 22:08:24 +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 |
|
Benoit Marty
|
e35ee03178
|
Try to workaround Dependabot issue #5961
|
2022-05-09 11:40:53 +02:00 |
|
Marcel
|
3f56dad1eb
|
Fixed dependabot
|
2022-05-06 18:23:58 +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 |
|
Benoit Marty
|
26edf79aa2
|
Fix detected issues
|
2022-05-05 15:04:43 +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 |
|
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 |
|
SpiritCroc
|
51aec8551b
|
Use Schildi-blue for notifications, unread marker, links
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
|
2022-04-24 10:46:45 +02:00 |
|
Eric Decanini
|
c21ec983e8
|
Merge pull request #5805 from vector-im/task/eric/format-project
Formats project with new code style
|
2022-04-21 12:43:28 +02:00 |
|
Eric Decanini
|
aebdee1070
|
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes
Potentially fixes intermittent crashing from sending gallery images
|
2022-04-21 11:54:59 +02:00 |
|
ericdecanini
|
de899bbb18
|
Formats entire project
|
2022-04-21 11:50:15 +02:00 |
|
ericdecanini
|
6aa0be22c9
|
Makes MediaType internal
|
2022-04-21 10:42:08 +02:00 |
|
ericdecanini
|
0556a3d088
|
Makes MediaFileUtils function internal
|
2022-04-19 13:31:37 +02:00 |
|
Olivér Falvai
|
2bbecd4cc5
|
Fix regressions
|
2022-04-17 11:35:30 +02:00 |
|
Olivér Falvai
|
2c84f234a6
|
Cleanup
|
2022-04-17 11:09:10 +02:00 |
|
Olivér Falvai
|
4305b21ba8
|
Remove unused resource to make lint happy
|
2022-04-16 20:36:43 +02:00 |
|
Olivér Falvai
|
2138ec0799
|
Remove unused resource to make lint happy
|
2022-04-16 11:14:04 +02:00 |
|
Olivér Falvai
|
cdd7db4174
|
Fix unused resource references properly
|
2022-04-16 09:40:15 +02:00 |
|
Olivér Falvai
|
b3cfc88773
|
Fix androidTest
|
2022-04-15 23:36:42 +02:00 |
|
Olivér Falvai
|
a8bbf29b42
|
Remove unused dependencies
|
2022-04-15 22:50:54 +02:00 |
|
ericdecanini
|
b76ec78c5d
|
Fixes build error in CameraVideoPicker
|
2022-04-14 11:46:59 +02:00 |
|