SpiritCroc
|
d11c1fcc62
|
Merge tag 'v1.1.11' into sc
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
|
2021-06-24 10:19:24 +02:00 |
|
SpiritCroc
|
89ef62e1d5
|
Fix compile after v1.1.10 merge
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
|
2021-06-24 10:19:02 +02:00 |
|
SpiritCroc
|
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 |
|
SpiritCroc
|
9ba32bc5bb
|
Rework SC theme and more fix merge conflicts to make it compile again
Note: SC colors still need work, this is just to make the semi-merge compile.
Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768
|
2021-06-23 12:38:27 +02:00 |
|
SpiritCroc
|
7f84f79693
|
Re-enable crash report prompt onResume
Change-Id: Id21aae4b2c24cdd3fd3ee0051a0369034c117cea
|
2021-06-23 11:11:10 +02:00 |
|
SpiritCroc
|
0389084cb6
|
merge_helpers.sh: upstream renamed master -> main
Change-Id: I7980f26bdc7f90399999d8b86536b92ca1683d10
|
2021-06-23 11:09:09 +02:00 |
|
SpiritCroc
|
f66747e972
|
Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767
Conflicts:
vector/src/debug/res/layout/activity_debug_menu.xml
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.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/list/RoomListFragment.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/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
vector/src/main/res/color/button_positive_background_selector.xml
vector/src/main/res/color/button_positive_text_color_selector.xml
vector/src/main/res/color/checked_accent_color_selector.xml
vector/src/main/res/color/login_button_tint.xml
vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
vector/src/main/res/drawable/bg_login_server_checked.xml
vector/src/main/res/drawable/bg_send.xml
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/drawable/ic_settings_root_advanced.xml
vector/src/main/res/drawable/ic_settings_root_call.xml
vector/src/main/res/drawable/ic_settings_root_flair.xml
vector/src/main/res/drawable/ic_settings_root_general.xml
vector/src/main/res/drawable/ic_settings_root_help_about.xml
vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
vector/src/main/res/drawable/ic_settings_root_labs.xml
vector/src/main/res/drawable/ic_settings_root_notification.xml
vector/src/main/res/drawable/ic_settings_root_preferences.xml
vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
vector/src/main/res/drawable/splash.xml
vector/src/main/res/drawable/vector_tabbar_selected_background.xml
vector/src/main/res/layout/alerter_incoming_call_layout.xml
vector/src/main/res/layout/custom_action_item_layout_badge.xml
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
vector/src/main/res/layout/fragment_home_drawer.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
vector/src/main/res/layout/fragment_login_splash.xml
vector/src/main/res/layout/fragment_public_rooms.xml
vector/src/main/res/layout/fragment_qr_code_scanner.xml
vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
vector/src/main/res/layout/fragment_review_terms.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/fragment_space_add_rooms.xml
vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
vector/src/main/res/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_form_submit_button.xml
vector/src/main/res/layout/item_generic_list.xml
vector/src/main/res/layout/item_generic_with_value.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_notification_troubleshoot.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_settings_centered_image.xml
vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_verification_action.xml
vector/src/main/res/layout/view_attachment_type_selector.xml
vector/src/main/res/layout/view_bottom_sheet_action_button.xml
vector/src/main/res/layout/view_call_controls.xml
vector/src/main/res/menu/menu_submit.xml
vector/src/main/res/menu/menu_timeline.xml
vector/src/main/res/values/styles_riot.xml
vector/src/main/res/values/theme_dark.xml
|
2021-06-23 11:08:10 +02:00 |
Benoit Marty
|
a3d54f1466
|
Merge branch 'release/1.1.11' into main
|
2021-06-22 12:27:44 +02:00 |
|
Benoit Marty
|
b76fd5dd4e
|
Prepare release 1.1.11
|
2021-06-22 12:27:36 +02:00 |
Benoit Marty
|
48002e11b6
|
Merge pull request #3540 from vector-im/feature/bma/fix_composer
Send button does not show up half of the time (#3535)
|
2021-06-22 12:24:28 +02:00 |
|
Benoit Marty
|
434018074d
|
Merge pull request #3538 from vector-im/feature/fga/fix_signout
Fix crash on signout: release session at the end of clean up
|
2021-06-21 14:11:10 +02:00 |
|
Benoit Marty
|
c21b19f49f
|
Send button does not show up half of the time (#3535)
|
2021-06-21 14:06:43 +02:00 |
ganfra
|
d8327a5161
|
Fix crash on signout: release session at the end so you clean up files first.
|
2021-06-21 11:10:10 +02:00 |
|
SpiritCroc
|
6626c5b600
|
Merge commit '8b138e8ff' into sc
Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc
Conflicts:
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.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/MessageTextItem.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/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
|
2021-06-20 09:18:03 +02:00 |
|
SpiritCroc
|
fb2551fc90
|
[TMP] Automatic upstream merge preparation
Change-Id: Ia98cb8dfb432d851e1e2c6bc63449b2341c7e5ac
|
2021-06-20 09:04:09 +02:00 |
|
SpiritCroc
|
5273656c34
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: Id37357a895b6a6aca2f02c06b03d9bebb14e4739
|
2021-06-20 09:04:08 +02:00 |
|
Benoit Marty
|
b30c27b7a6
|
Version++
|
2021-06-18 21:50:12 +02:00 |
|
Benoit Marty
|
c7fc3f0b42
|
Merge branch 'release/1.1.10' into main
|
2021-06-18 21:39:02 +02:00 |
|
Benoit Marty
|
729ce509d4
|
Merge branch 'release/1.1.10' into develop
|
2021-06-18 21:38:59 +02:00 |
|
Benoit Marty
|
d737d81458
|
Release 1.1.10: fastlane
|
2021-06-18 21:38:38 +02:00 |
|
Benoit Marty
|
dcce618fd5
|
Release 1.1.10: towncrier
|
2021-06-18 21:36:57 +02:00 |
|
Benoit Marty
|
d6363a6e1b
|
Update template and use a more power full configuration
|
2021-06-18 21:35:09 +02:00 |
|
Benoit Marty
|
eea18fb71c
|
Rename towncrier folder from newsfragment to changelog.d
|
2021-06-18 21:33:50 +02:00 |
|
Benoit Marty
|
71a8a948a6
|
Merge pull request #3530 from vector-im/feature/bma/prepare_release_1.1.10
Prepare release 1.1.10
|
2021-06-18 21:04:27 +02:00 |
|
Benoit Marty
|
c4a6d92481
|
Fix bad alpha on tinted drawable - 2
|
2021-06-18 17:59:55 +02:00 |
|
Benoit Marty
|
0720556e48
|
Fix bad alpha on tinted drawable - 1
|
2021-06-18 17:54:41 +02:00 |
|
Benoit Marty
|
e12b9a3dfe
|
Fix crash due to style refacto
|
2021-06-18 17:28:25 +02:00 |
|
Benoit Marty
|
81053f5492
|
Use debouncedClick
|
2021-06-18 15:32:33 +02:00 |
|
Benoit Marty
|
15695dca69
|
Add some TextViews
|
2021-06-18 15:31:02 +02:00 |
|
Benoit Marty
|
9f101423e2
|
Add some TextViews
|
2021-06-18 15:08:51 +02:00 |
|
Benoit Marty
|
a619b0141a
|
Rename file
|
2021-06-18 15:02:18 +02:00 |
|
Benoit Marty
|
1ffe57ce94
|
Change vctr_header_background alias from vctr_content_quinary to vctr_system
|
2021-06-18 13:27:21 +02:00 |
|
Benoit Marty
|
9a70ddf0b8
|
Fix color for tiles and space buttons
Also remove unused resource
|
2021-06-18 13:06:53 +02:00 |
|
Benoit Marty
|
aeffaac065
|
Update layout
https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2857%3A321
|
2021-06-18 12:59:12 +02:00 |
|
Benoit Marty
|
be578d7fae
|
Merge pull request #3484 from vector-im/feature/bca/spaces_alias
Feature/bca/spaces alias
|
2021-06-18 12:32:35 +02:00 |
Valere
|
4180b4ccd3
|
Code review
|
2021-06-18 10:47:21 +02:00 |
|
Valere
|
301251262d
|
Code review cleaning
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
19a2b56011
|
Code review AliasAvailabilityResult
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
9190e1bfb5
|
Code Review Formatting
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
88119a15bf
|
Core review rename input Suffix|Prefix
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
b6b80120b2
|
update change log
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
28a6caf754
|
cleaning + rebase
|
2021-06-18 10:41:24 +02:00 |
|
Valere
|
b1ab6eb58f
|
Add alias management in space settings
|
2021-06-18 10:41:13 +02:00 |
|
Valere
|
fb337dacd6
|
Add space alias in creation wizard
|
2021-06-18 10:41:13 +02:00 |
|
Benoit Marty
|
5325c761f4
|
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd
Feature/bca/spaces dnd
|
2021-06-18 10:28:59 +02:00 |
|
Benoit Marty
|
1538a62e37
|
Merge pull request #3523 from vector-im/feature/bma/preparing_release
Preparing release 1.1.10
|
2021-06-18 10:26:44 +02:00 |
|
Benoit Marty
|
dd1f65dd6f
|
Run ./tools/import_emojis.py
Only a small issue is fixed
|
2021-06-18 10:25:37 +02:00 |
|
Benoit Marty
|
930675d4c9
|
Add a formatted version of emoji_picker_datasource.json. Not included in the APK.
|
2021-06-18 10:25:37 +02:00 |
|
Benoit Marty
|
bffa96ae10
|
Import sas strings
|
2021-06-18 10:25:37 +02:00 |
|
Benoit Marty
|
9f96974e67
|
Rename some theme to follow naming convention
|
2021-06-18 10:25:37 +02:00 |