13207 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
SpiritCroc	2e3e233d5d	ViewPager: avoid smooth scrolling large distances ... Change-Id: Id99152c8f10aab1a93679e6559e446fb4135070c	2021-12-23 14:54:46 +01:00
SpiritCroc	e6a7b4aa5f	ViewPager: use default caching strategy ... Change-Id: Ic09ca9f15320ca7e8ba5c1457e934d909055449e	2021-12-23 14:46:54 +01:00
SpiritCroc	197bf860c3	Automatic SchildiChat string correction ... Change-Id: I7feb0338399c577ec5183c62c6219b79e8eb5d35	2021-12-23 14:42:24 +01:00
SpiritCroc	832b684550	Automatic upstream merge postprocessing ... Change-Id: I4a541aa3f5f767b9b7c1cecd22b8ecf3adedbf99	2021-12-23 14:42:23 +01:00
SpiritCroc	acdd4e24b9	Merge tag 'v1.3.12' into sc ... Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10 Conflicts: build.gradle vector/build.gradle 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/TimelineEventVisibilityHelper.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/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.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/RoomProfileActivity.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/res/drawable/highlighted_message_background.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_selection.xml vector/src/main/res/layout/fragment_room_detail.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_expandable_textview.xml vector/src/main/res/layout/item_login_header.xml vector/src/main/res/layout/item_radio.xml vector/src/main/res/layout/item_room.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml vector/src/main/res/layout/item_timeline_event_code_block_stub.xml vector/src/main/res/layout/item_timeline_event_media_message_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_timeline_event_voice_stub.xml vector/src/main/res/layout/view_stub_room_profile_header.xml vector/src/main/res/layout/view_url_preview.xml vector/src/main/res/xml/vector_settings_labs.xml vector/src/main/res/xml/vector_settings_root.xml	2021-12-23 14:36:13 +01:00
SpiritCroc	43ba77577b	[TMP] Automatic upstream merge preparation ... Change-Id: I07249d2b85b4bd78844e5e74c0245116e9119499	2021-12-23 09:55:24 +01:00
SpiritCroc	4db21fb294	Automatic revert to unchanged upstream strings, pt.1 ... Change-Id: Id2de49d9a137fc056758739dfd127b668c1253d5	2021-12-23 09:55:24 +01:00
ganfra	1695fde15b	Merge branch 'release/1.3.12' into main	2021-12-20 15:32:27 +01:00
ganfra	4b2dd73d19	Release: prepare CHANGES	2021-12-20 14:56:27 +01:00
ganfra	721bf4fbd1	Merge pull request #4770 from vector-im/feature/adm/emoji-27-and-below-crash ... Fixing Android 8.1.1 / 27 and below emoji crash	2021-12-20 11:41:18 +01:00
Adam Brown	18df540487	adding changelog entry	2021-12-20 10:10:07 +00:00
Adam Brown	f1dff33dc2	removing android version bypass for using text futures ... - the emoji span changes affect all android versions	2021-12-20 10:09:17 +00:00
ganfra	c6a118fc1f	Update versions to 1.3.12	2021-12-17 19:05:17 +01:00
ganfra	cab28ffe7e	Merge branch 'release/1.3.11' into main	2021-12-17 18:53:26 +01:00
ganfra	f134ac6cdf	Merge tag '1.3.11' into develop ... no message	2021-12-17 18:53:26 +01:00
ganfra	6c127e9de5	Release: prepare CHANGES	2021-12-17 18:21:56 +01:00
ganfra	461beda634	Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash ... Fix crash ImmutableModelException	2021-12-17 15:30:19 +01:00
ganfra	e155eefb7b	Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation ... Unable to render messages	2021-12-17 12:35:37 +01:00
ganfra	ac65942c28	Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix ... Emojis in emotes causing crashes on Android 12+	2021-12-17 11:47:16 +01:00
Adam Brown	ddbf8582dd	removing trailing space	2021-12-17 10:46:03 +00:00
Adam Brown	6918372a87	extracting the emoji processing to an interface so that we can override the behaviour in the unit test	2021-12-17 10:38:49 +00:00
Adam Brown	b73bae452a	adding comment to explain SpannableStringBuilder usage	2021-12-17 09:37:50 +00:00
Adam Brown	e1eafd2c64	adding changelog entry	2021-12-17 09:26:10 +00:00
Adam Brown	37db28ae7c	using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet	2021-12-17 09:25:16 +00:00
Adam Brown	9e2fb1366f	Update changelog.d/4743.bugfix ... Co-authored-by: Benoit Marty <benoitm@matrix.org>	2021-12-17 09:22:12 +00:00
ClaireGizard	ca58a04f57	Small UI fix in room member profile hearder (#4700) ... Small ui fix on room member profile name Co-authored-by: Claire Gizard <cgizard>	2021-12-16 21:10:03 +01:00
ariskotsomitopoulos	cabf12289b	Add changelog	2021-12-16 20:39:21 +02:00
Adam Brown	049cad7d2c	adding changelog entry	2021-12-16 18:37:03 +00:00
Adam Brown	ae6be3fdc4	adding missing binding options emote content ... - fixes android 12+ crash when certain emojis are used within the emote content	2021-12-16 18:34:00 +00:00
ariskotsomitopoulos	2275bdd4fa	Fix crash ImmutableModelException	2021-12-16 20:14:21 +02:00
Benoit Marty	3b35be510f	Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading ... Avoid leaking Activity Window when showing loading dialog	2021-12-16 11:07:23 +01:00
Benoit Marty	addeec0ff8	Merge pull request #4731 from vector-im/feature/bma/center ... Call banner: center text vertically	2021-12-16 10:51:37 +01:00
Benoit Marty	9adc946b7e	Merge pull request #4732 from vector-im/gradlew-update-7.3.2 ... Update Gradle Wrapper from 7.3.1 to 7.3.2	2021-12-16 09:55:37 +01:00
SpiritCroc	94bd7c9e33	Fix some bubble style ... Change-Id: If636cb41326658afdf1cc3b01c886b85dd568c24	2021-12-16 09:33:00 +01:00
gradle-update-robot	db1e0af4e5	Update Gradle Wrapper from 7.3.1 to 7.3.2. ... Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>	2021-12-16 00:13:21 +00:00
Benoit Marty	818a8898b3	Call banner: center text vertically	2021-12-15 22:19:23 +01:00
Benoit Marty	63660ab496	Merge pull request #4728 from vector-im/feature/adm/proxity-sensor-not-releasing ... Proximity sensor not releasing	2021-12-15 21:23:12 +01:00
Adam Brown	eb9c46b9a2	adding changelog entry	2021-12-15 18:17:04 +00:00
Adam Brown	4c238e81cf	dismisses any potential loading dialogs when the linked fragment is destroyed ... - fixes leaking the activity window when the fragment is destroyed	2021-12-15 18:16:10 +00:00
Adam Brown	8c913d29cb	adding changelog entry	2021-12-15 17:35:27 +00:00
Adam Brown	8b96d8cd8d	only acquire a wake lock if a lock is not already held	2021-12-15 17:32:39 +00:00
Benoit Marty	4949a06343	Use stable build tools for the release.	2021-12-14 16:37:52 +01:00
Benoit Marty	fa65cc59fe	Version++	2021-12-14 14:46:08 +01:00
Benoit Marty	973b42be4c	Merge branch 'release/1.3.10' into main	2021-12-14 14:41:08 +01:00
Benoit Marty	7bdecafe54	Merge branch 'release/1.3.10' into develop	2021-12-14 14:41:07 +01:00
Benoit Marty	ce558a06eb	fastlane	2021-12-14 14:40:49 +01:00
Benoit Marty	5dfe24ca45	Towncrier	2021-12-14 14:39:39 +01:00
Benoit Marty	73dba2b692	Fix another crash	2021-12-14 14:37:01 +01:00
Benoit Marty	32820f7893	Comment out some part of the test to make it pass. Tested manually for this time.	2021-12-14 13:27:33 +01:00
Benoit Marty	1961309458	Fix a crash on reactions bottom sheet	2021-12-14 13:26:03 +01:00