ericdecanini
|
5cc7deea4e
|
Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.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/worker/MatrixWorkerFactory.kt
# vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
# vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
# vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
# vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/factory/LiveLocationShareMessageItemFactory.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/RoomSummaryItemFactory.kt
# vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
# vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
|
2022-06-03 12:06:23 +02:00 |
|
ericdecanini
|
e6e05317e1
|
Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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
|
2022-05-31 14:21:16 +02:00 |
|
ericdecanini
|
b3fdb5ed17
|
Changes code style when arrow alignment
|
2022-05-23 12:57:57 +02:00 |
|
ericdecanini
|
3f3662e605
|
Changes code style method parameters new line around parentheses to true
|
2022-05-23 12:30:42 +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 |
|
ericdecanini
|
de899bbb18
|
Formats entire project
|
2022-04-21 11:50:15 +02:00 |
|
Olivér Falvai
|
2c84f234a6
|
Cleanup
|
2022-04-17 11:09:10 +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 |
|
Maxime Naturel
|
882b143569
|
Permission and error handling
|
2022-02-24 17:39:41 +01:00 |
|
Maxime Naturel
|
c6c46375d6
|
Creating a ViewModel
|
2022-02-24 17:39:40 +01:00 |
|
Maxime Naturel
|
e6995cbdd4
|
Draft
|
2022-02-24 17:39:40 +01:00 |
|
ericdecanini
|
c1afb3d5d1
|
moves attachment-viewer module to library
|
2022-02-22 19:44:30 +01:00 |
|