SpiritCroc
677330921d
Merge tag 'v1.1.16' into sc
...
v1.1.16
Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
2021-08-10 09:54:58 +02:00
Valere
6c2a917d9f
WIP
2021-07-30 18:43:34 +02:00
SpiritCroc
89ef62e1d5
Fix compile after v1.1.10 merge
...
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
2021-06-24 10:19:02 +02:00
Benoit Marty
1a898f0404
Rename themes follow Android conventions
2021-06-16 12:34:14 +02:00
SpiritCroc
6c06462ec9
Merge tag 'v1.1.8' into sc
...
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480
Conflicts:
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/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2021-05-26 10:44:19 +02:00
Benoit Marty
a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2
2021-05-20 15:18:18 +02:00
SpiritCroc
db6cfd3054
Merge tag 'v1.1.7' into sc
...
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32
Conflicts:
.idea/codeStyles/Project.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.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/list/SpaceRoomListSectionBuilder.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/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/values-ca/strings.xml
vector/src/main/res/values-cs/strings.xml
vector/src/main/res/values-de/strings.xml
vector/src/main/res/values-et/strings.xml
vector/src/main/res/values-fa/strings.xml
vector/src/main/res/values-fr/strings.xml
vector/src/main/res/values-it/strings.xml
vector/src/main/res/values-sq/strings.xml
vector/src/main/res/values-sv/strings.xml
vector/src/main/res/values-vi/strings.xml
vector/src/main/res/values-zh-rTW/strings.xml
vector/src/main/res/values/strings.xml
vector/src/main/res/xml/vector_settings_labs.xml
2021-05-12 16:01:36 +02:00
Valere
99d4471799
space beta people screen
2021-05-05 17:54:56 +02:00
SpiritCroc
39359f7d24
Merge remote-tracking branch 'upstream/develop' into spaces
...
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
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/build.gradle
vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDrawerFragment.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/timeline/action/MessageActionsViewModel.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/list/RoomListAction.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/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
2021-05-02 12:12:52 +02:00
Benoit Marty
faef2fba9a
Enable login v2 by default, but keep the possibility to use v1
2021-04-29 15:57:52 +02:00
Benoit Marty
408a0fc010
Login UX flow v2
2021-04-29 15:57:22 +02:00
Benoit Marty
751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk
...
Spaces support - beta
2021-04-29 10:18:31 +02:00
Benoit Marty
c40476aa94
Add ability to install APK from directly from Element ( #2381 )
...
And cleanup `data class OpenFile`
2021-04-28 15:55:21 +02:00
Benoit Marty
9cb19c0581
Fix issues on Android 11 ( #3067 )
...
Add <queries> tag in manifest to be able to open file using external app and to use full feature of CustomTab
2021-04-28 14:04:27 +02:00
Valere
8146d8ab1e
Add Rooms to space
2021-04-28 11:15:58 +02:00
Benoit Marty
eac8938186
Cleanup
2021-04-28 11:15:58 +02:00
Valere
4b27ad8ba6
Creation wizard WIP
2021-04-28 11:15:58 +02:00
Valere
e2578a29ed
Basic space join / use tmp msc id / db model update
2021-04-28 11:15:58 +02:00
Valere
df341d8ea3
Basic peeking preview and join and filter
2021-04-28 11:15:58 +02:00
SpiritCroc
699ad4eaeb
Merge tag 'v1.1.1' into sc
...
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/helper/MessageInformationDataFactory.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/item/MessageFileItem.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/MessageInformationData.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/res/drawable/rounded_rect_shape.xml
vector/src/main/res/menu/menu_timeline.xml
vector/src/main/res/values/array.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2021-03-14 10:58:57 +01:00
SpiritCroc
cedf599a70
Switch missed themes in manifest to .SC themes for proper accent
...
Change-Id: I3f2b15584b93826c514dca6fdd972217ce1ee7a3
2021-02-24 17:18:46 +01:00
Benoit Marty
9c1475d2f1
To squash
2021-02-23 11:28:38 +01:00
Benoit Marty
486815b9ab
Pip
2021-02-23 11:28:38 +01:00
SpiritCroc
ca0b360875
Merge tag 'v1.1.0' into sc
...
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6
Conflicts:
vector/build.gradle
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/room/breadcrumbs/BreadcrumbsItem.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/timeline/item/AbsBaseMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
vector/src/main/res/drawable/oval_positive.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/dialog_disclaimer_content.xml
vector/src/main/res/layout/fragment_login_splash.xml
vector/src/main/res/layout/item_generic_with_value.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/menu/menu_timeline.xml
vector/src/main/res/values/array.xml
2021-02-20 15:41:01 +01:00
Benoit Marty
cf0b4d2581
Merge branch 'develop' into feature/bca/devtools
2021-02-15 16:00:32 +01:00
Benoit Marty
1ec4424c0a
Upgrade Jitsi library from 2.9.3 to 3.1.0
2021-02-10 12:15:32 +01:00
Valere
e5da026f1f
Dev tools initial commit
2021-02-10 10:17:19 +01:00
SpiritCroc
c2ce787310
Merge tag 'v1.0.16' into sc
...
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
2021-02-04 17:10:15 +01:00
ganfra
6cd462f852
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-04 16:52:06 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
...
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
ganfra
49aed39711
Fix multiple tasks
2021-02-02 17:11:45 +01:00
Valere
8129cd0cd3
Cleaning + changelog
2021-02-02 09:32:04 +01:00
Valere
1244d00b31
SSO UIA
2021-02-01 16:39:14 +01:00
ganfra
f4fd8af3b4
Merge branch 'develop' into feature/fga/voip_v1_start
2021-01-29 18:46:19 +01:00
SpiritCroc
41e9e1e4f5
Revert "Revert "Remove empty task affinity""
...
Still issues with duplicated tasks otherwise
This reverts commit aca8715ec8
2021-01-19 11:04:18 +01:00
SpiritCroc
aca8715ec8
Revert "Remove empty task affinity"
...
Upstream found a better fix.
This reverts commit 3cb5f6087c
2021-01-16 15:00:53 +01:00
SpiritCroc
53c498b728
Merge tag 'v1.0.14' into sc
...
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5
Conflicts:
gradle/wrapper/gradle-wrapper.properties
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/media/UrlsExtractor.kt
vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.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/room/detail/RoomDetailFragment.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/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.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
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
Benoit Marty
e21c8792e6
Fix switch theme issue, and white field issue ( #2599 , #2528 )
...
Remove some workarounds. I cannot reproduce the bug of signout which does not destroy the HomeActivityViewModel...
2021-01-08 15:55:32 +01:00
ganfra
22c981d8bf
VoIP: start adding UI for call transfer
2020-12-22 16:44:39 +01:00
ganfra
14288b545b
Merge branch 'develop' into feature/fga/voip_v1_start
2020-12-22 11:38:41 +01:00
SpiritCroc
8da4044de6
Merge tag 'v1.0.13' into sc
...
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
Benoit Marty
68cd06f1fb
Improve redirect url, which can be visible to the user: "element://element" -> "element://connect"
2020-12-17 12:11:30 +01:00
SpiritCroc
38b82fb823
Merge tag 'v1.0.12' into sc
...
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.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/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values-v23/theme_status.xml
vector/src/main/res/values/array.xml
vector/src/main/res/values/theme_status.xml
Note to self: need to check if URL preview works with wrap_content
Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
Benoit Marty
5461fd4060
Some cleanup up
2020-12-11 16:35:04 +01:00
Valere
bd9da8eaa6
element:// support + basic peeking + fix join via server
2020-12-11 15:06:39 +01:00
ganfra
efec711ced
Merge branch 'develop' into feature/fga/voip_v1_start
2020-12-03 13:01:54 +01:00
ganfra
131afcebf1
VoIP: exclude call activity from recents
2020-12-02 12:18:15 +01:00
SpiritCroc
3cb5f6087c
Remove empty task affinity
...
By default, all activities of the app share the same task affinity. By
setting it to "" for this activity, on launch the splash screen and the
home activity are launched as two separate tasks (tested on Android 11).
Change-Id: I60e3791017b6c33288d152cf97c5af04ae8979eb
2020-11-29 18:27:37 +01:00
SpiritCroc
0b4f56d7a0
Merge remote-tracking branch 'upstream/master' into sc
...
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c
Conflicts:
gradle/wrapper/gradle-wrapper.properties
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
vector/src/main/res/layout/fragment_known_users.xml
vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
Valere
804afc9a1d
Fix issues with matrix.to deep linking
2020-11-26 09:09:27 +01:00
