38c8e30541
Merge tag 'v1.5.26' into sc
...
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/res/drawable/ic_composer_rich_text_editor_close.xml
vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
vector/src/main/res/drawable/ic_rich_composer_add.xml
vector/src/main/res/drawable/ic_rich_composer_send.xml
2023-02-23 11:55:21 +01:00
b9e18ac4b5
Ignore sonarlint generated files in repo
2023-02-08 14:16:00 +01:00
fe785613e7
Merge tag 'v1.5.2' into sc
...
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e
Conflicts:
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.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/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2022-10-07 20:32:26 +02:00
7f8cb4b1a1
ignoring the screenshot failure results from git
2022-09-26 10:26:38 +01:00
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
56691f613e
Setup Danger to Element Android project.
2022-07-29 10:02:40 +02:00
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
b5aedd4626
Re-implement lock screen feature using our own implementation.
2022-06-20 17:38:05 +02:00
a90e1a15eb
Ignore fastlane/README.md
...
Change-Id: I0805909a4b23c0f55d82f1e049938a81926b2ebe
2022-03-19 11:51:06 +01:00
dffc0c1d65
Merge tag 'v1.3.2' into sc
...
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5
Conflicts:
.gitignore
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/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/composer/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.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/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2021-10-11 09:55:26 +02:00
03bdcee3ad
Install ktlint plugin
2021-10-01 13:31:15 +02:00
4f93eb041c
Merge tag 'v1.3.0' into sc
...
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
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/pushers/VectorMessagingReceiver.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/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
712b8ede14
adding benchmarking script to start monitoring build times
...
- makes use of the gradle-profiler to run the build multiple times
- currently uses reduced warm up/iteration count as the build takes a long time, can be increased once the build time is reduced
2021-09-23 16:20:41 +01:00
72aa4bb999
Merge tag 'v1.1.10' into sc
...
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab
Conflicts:
library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
library/ui-styles/src/main/res/drawable/splash.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.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/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.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/res/drawable/ic_attachment.xml
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/drawable/ic_keyboard.xml
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_user_list.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_space_beta_header.xml
vector/src/main/res/layout/item_suggested_room.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values/styles_riot.xml
2021-06-23 13:38:41 +02:00
cfc99a93d7
Git ignore private folder
2021-06-17 17:58:13 +02:00
f4d0993a2b
Enable semi-automatic correct_strings.sh-patching
...
Change-Id: I072f2ff71e862a1a140c8879754669f7231745c2
2021-02-21 10:35:55 +01:00
c97d298166
Merge pull request #948 from vector-im/feature/artifacts_downloading
...
Feature/artifacts downloading
2020-02-10 14:52:25 +01:00
7d00aabc85
Share the same Copyright header. Disabled for XML files
2020-02-05 17:48:59 +01:00
c3bb421c1e
ignore .idea/inspectionProfiles
2020-02-04 11:53:09 +01:00
859c75df98
Initial commit
2020-01-21 10:25:57 +01:00
a916bd4ba8
Share the same code formatting rules
2020-01-16 14:05:14 +01:00
8e3234d188
Clean some code
2019-10-21 18:08:42 +02:00
82fc97f619
Add dictionary specific to the project to VCS
2019-10-11 09:32:43 +02:00
72d3f1e909
Configure ktlint
2019-10-09 15:06:38 +02:00
a199eaa171
Setup various tools
2019-03-13 17:00:30 +01:00
7e199494e7
Stop tracking .idea files
2018-11-09 09:50:23 +01:00
b406e8301a
first commit
2018-10-03 17:58:12 +02:00
SpiritCroc
yostyle
Adam Brown
Benoit Marty
Jorge Martín
Benoit Marty
Valere
ganfra
ganfra