Commit graph

1547 commits

Author SHA1 Message Date
Adam Brown
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications
Missing notifications due to stuck background workers
2022-08-22 17:20:04 +01:00
ericdecanini
edb2d5d78e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
2022-08-22 14:56:14 +02:00
ericdecanini
a7aa72fb6e Adds changelog file 2022-08-22 14:21:48 +02:00
Adam Brown
9b57630eae
Merge pull request #6873 from vector-im/feature/adm/allow-trusting-certificates
FTUE - Fix trusting certificates during edit server flow
2022-08-22 11:47:50 +01:00
Adam Brown
7211c9c08e
Merge pull request #6890 from vector-im/feature/adm/missing-notifications-on-login
Missing push notifications on login
2022-08-22 11:14:28 +01:00
Benoit Marty
e86058b299
Merge pull request #6884 from vector-im/feature/bma/sync_thread_investigation
Ensure sync thread is started
2022-08-22 12:09:54 +02:00
Onuray Sahin
43f191d073 Add changelog. 2022-08-22 12:40:15 +03:00
Adam Brown
d405a66443
Merge pull request #6834 from vector-im/feature/adm/ftue-empty-identity-providers
Allow empty SSO `identity_providers`
2022-08-22 08:44:31 +01:00
Adam Brown
06c77e4b5e adding changelog entry 2022-08-19 17:14:20 +01:00
Nikita Fedrunov
cc49e96d36
dialpad moved from bottom navigation tab to a separate activity (#6887) 2022-08-19 17:55:43 +02:00
Nikita Fedrunov
0629cae183
added dialog to change app layout settings (#6840) 2022-08-19 17:53:48 +02:00
ericdecanini
add7bd9052 Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug
# Conflicts:
#	vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
2022-08-19 14:33:49 +02:00
ericdecanini
7fafd07e2c Changes changelog file 2022-08-19 13:32:31 +02:00
Benoit Marty
f75b2e6ef1 Changelog files. 2022-08-19 10:11:31 +02:00
ericdecanini
90ab40dccb Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet 2022-08-18 17:38:15 +02:00
ericdecanini
2a1483f6a5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-settings 2022-08-18 17:37:56 +02:00
ericdecanini
88fc0afea5 Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug 2022-08-18 17:37:16 +02:00
ericdecanini
fecaf3e360 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 2022-08-18 17:36:08 +02:00
ericdecanini
e17e3fe00a Adds changelog file 2022-08-18 17:22:19 +02:00
Adam Brown
cdeea21917 adding changelog entries 2022-08-18 11:41:28 +01:00
Adam Brown
e948fe05ca adding changelog entry 2022-08-18 11:41:19 +01:00
Andrew Morgan
e00a9a10fb changelog 2022-08-18 11:24:02 +01:00
Florian Renaud
519855445e Start DM on first message when selecting "direct message" from the room member details 2022-08-18 11:37:55 +02:00
ericdecanini
136ca4bafb Adds changelog file 2022-08-18 10:16:54 +02:00
ericdecanini
003a254c17 Adds changelog file 2022-08-17 22:31:18 +02:00
ericdecanini
ce8939a092 Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet
# Conflicts:
#	vector/src/main/res/values/strings.xml
2022-08-17 21:13:39 +02:00
Adam Brown
a3a76d1c35 adding changelog entry 2022-08-17 15:24:05 +01:00
Benoit Marty
6c860710bd
Merge pull request #6843 from vector-im/feature/bma/detect_object_log
Fix some string template
2022-08-17 14:37:42 +02:00
Eric Decanini
b6bcefbb92
Merge pull request #6795 from vector-im/feature/eric/toolbar-space-name
New App Layout: Space name reflected in toolbar
2022-08-17 10:52:07 +02:00
Eric Decanini
4fedafc1be
Merge pull request #6749 from vector-im/feature/eric/space-list-modal
Adds Space List Bottom Sheet
2022-08-17 10:51:56 +02:00
Benoit Marty
446bf7e0aa changelog 2022-08-16 16:10:15 +02:00
Adam Brown
74d99b156f
Merge pull request #6833 from vector-im/feature/adm/removing-login-poc
Removing `Login2` proof of concept
2022-08-16 13:02:40 +01:00
ericdecanini
8b0fba2ef5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
2022-08-16 11:58:25 +02:00
Benoit Marty
8a4bd0c467
Merge pull request #6805 from vector-im/cgizard/ISSUE-6645
Add inputType for room name creation and settings
2022-08-16 11:05:57 +02:00
Onuray Sahin
6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list
[Devices Management] Header view for sessions lists in new layout (PSG-668)
2022-08-15 23:09:53 +03:00
Adam Brown
b152910f9c adding changelog entry 2022-08-15 14:12:42 +01:00
Adam Brown
314b077fbd adding changelog entry 2022-08-15 11:58:04 +01:00
Florian Renaud
62f7b40a3e Add changelog entry 2022-08-12 13:10:49 +02:00
Maxime NATUREL
971ad26deb
Merge pull request #6809 from vector-im/fix/mna/leak-in-call
[Call] Memory leak after a call
2022-08-11 16:44:33 +02:00
Nikita Fedrunov
e0e21d4282
filtered room list at home (#6724) 2022-08-11 16:26:24 +02:00
Maxime NATUREL
292f6622bd Adding changelog entry 2022-08-11 15:28:18 +02:00
Maxime NATUREL
ef2aa6f829 Adding changelog entry 2022-08-11 14:26:15 +02:00
Maxime NATUREL
fa8f72c909
Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary
Add a developer setting to enable LeakCanary at runtime
2022-08-11 12:10:26 +02:00
Adam Brown
616c16f8c6
Merge pull request #6783 from vector-im/feature/adm/decouple-variants
Decouple `:vector` variants/build types
2022-08-11 10:59:42 +01:00
Claire G
ce23303b97 Add inputType for room name creation and settings 2022-08-11 11:53:43 +02:00
Maxime NATUREL
0515303c8c
Merge pull request #6800 from vector-im/feature/mna/new-device-management-screen
[Devices management] Add a feature flag and empty screen for future new layout (PSG-676)
2022-08-11 08:59:57 +02:00
ericdecanini
989471a409 Adds changelog file 2022-08-10 17:44:33 +02:00
Maxime NATUREL
a2c39c079a Adding changelog entry 2022-08-10 15:28:51 +02:00
Maxime NATUREL
12405527e1 Adding changelog entry 2022-08-10 14:47:08 +02:00
Adam Brown
fcc7bbadfa Merge branch 'release/v1.4.32' into develop 2022-08-10 12:30:42 +01:00
ericdecanini
527bcf2e6f Adds changelog file 2022-08-10 11:30:15 +02:00
ericdecanini
fd37b31c44 Changes changelog file extension 2022-08-10 11:28:14 +02:00
Maxime NATUREL
ed00685514 Adding changelog entry 2022-08-10 10:40:06 +02:00
Adam Brown
e81da5d8b4 generating 1.4.32 changelog 2022-08-10 09:02:04 +01:00
ericdecanini
e87eefb319 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
2022-08-10 08:24:55 +02:00
Eric Decanini
ce4ab78f13
Merge pull request #6693 from vector-im/feature/eric/new_fab
New App Layout FABs
2022-08-10 08:13:36 +02:00
Adam Brown
d7949307a4 adding changelog entry 2022-08-09 14:01:00 +01:00
Jorge Martín
2f4725cfe9 Prevent crash while validating biometric key. 2022-08-09 14:03:39 +02:00
Jorge Martín
6e1e31bac1 Avoid crashes from unknown exceptions on lockscreen key migration. 2022-08-09 12:52:28 +02:00
Adam Brown
58d47df37b
Merge pull request #6736 from vector-im/feature/adm/non-ascii-username
Fixes crash when entering non ascii username during account creation
2022-08-09 11:52:02 +01:00
ericdecanini
756570793f Adds changelog file 2022-08-05 17:12:47 +02:00
ericdecanini
1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
ericdecanini
41d859dc5b Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
2022-08-05 17:10:36 +02:00
Adam Brown
81897a179e
Merge pull request #6741 from vector-im/feature/adm/focus-errors
FTUE - Focus errors showing on wrong page
2022-08-05 15:12:47 +01:00
Maxime NATUREL
2dc92caa30
Merge pull request #6712 from vector-im/feature/mna/map-loading-error
[Location Share] Render fallback UI when map fails to load (PSG-607)
2022-08-05 11:17:37 +02:00
Maxime NATUREL
6590cf5524 adding changelog entry 2022-08-04 16:58:28 +02:00
Maxime NATUREL
018772ca9a Adding changelog entry 2022-08-04 16:57:14 +02:00
Michael Kaye
09a91c4541
Make it easier to find developer sign-off instructions (#6739)
* Make it easier to find sign-off instructions by linking directly to DCO docs from danger message.
2022-08-04 15:54:53 +01:00
Adam Brown
b6582c4144 adding changelog entry 2022-08-04 14:29:26 +01:00
Maxime NATUREL
dd69b254f9
Merge pull request #6654 from vector-im/feature/mna/update-sending-period-lls
[Location share] Update minimum sending period to 5 seconds for a live
2022-08-04 14:17:00 +02:00
Adam Brown
9a97e0bf61 adding changelog entry 2022-08-04 12:04:51 +01:00
Maxime NATUREL
bfd9dcbca2
Merge pull request #6681 from vector-im/fix/mna/leak-tab-layout-mediator
[FTUE] Memory leak on FtueAuthSplashCarouselFragment
2022-08-03 14:18:41 +02:00
Adam Brown
8aaf185a8e
Merge pull request #6517 from vector-im/feature/adm/build-config
Avoiding direct `BuildConfig` usage
2022-08-02 18:07:17 +01:00
ericdecanini
55d8b6a819 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 2022-08-02 18:07:34 +02:00
Maxime NATUREL
ac8597e745
Merge pull request #6676 from vector-im/fix/mna/fix-memory-leaks-lls
[Location sharing] - Fix the memory leaks (PSG-656)
2022-08-02 18:01:48 +02:00
Eric Decanini
e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar
New App Layout Toolbar
2022-08-02 17:44:53 +02:00
Maxime NATUREL
a53de92b10
Merge pull request #6688 from vector-im/fix/mna/missing-text-on-map-symbol
[Location sharing] Invisible text on map symbol
2022-08-02 16:38:11 +02:00
Adam Brown
c07296c94d adding changelog entry 2022-08-02 14:31:46 +01:00
Jorge Martin Espinosa
c848615636
Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. (#6714)
* Disable 'Enable biometrics' option if there are not biometric authenticators enrolled.

* Improve biometric pref enabled check

* Fix changelog issue

* Address review comments. Add extra catch clauses to key migrations.

* Add tests for key migrators
2022-08-02 15:31:08 +02:00
Maxime NATUREL
1ef809c633 Adding changelog entry 2022-08-02 10:36:34 +02:00
Maxime NATUREL
0944b2ff39 Adding changelog entry 2022-08-02 09:13:16 +02:00
Maxime NATUREL
a8df1af6fd Adding changelog entry 2022-08-02 09:09:19 +02:00
SpiritCroc
3845e1435c Fix cleartext leak in log
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
2022-08-01 13:00:30 +02:00
Eric Decanini
ddaf1128ac
Merge pull request #6598 from vector-im/task/eric/space-switching-unit-tests
Space Switching Refactoring and Unit Tests
2022-07-29 16:21:33 +02:00
ericdecanini
d116d98080 Adds changelog file 2022-07-29 15:48:58 +02:00
Benoit Marty
59f00cd196
Merge pull request #6637 from vector-im/feature/bma/danger
Danger
2022-07-29 12:55:32 +02:00
Maxime NATUREL
c7d5ceca5d
Merge pull request #6644 from vector-im/feature/mna/notification-tap-lls
[Location Share] Open maximized map on tapping on live sharing notification (PSG-616)
2022-07-29 11:27:53 +02:00
Maxime NATUREL
79ea66890f Adding changelog entry 2022-07-29 10:20:32 +02:00
Benoit Marty
036521af94 Add changelog 2022-07-29 10:02:40 +02:00
Adam Brown
7b208316e4 generating 1.4.30 changelog 2022-07-29 08:57:57 +01:00
Maxime NATUREL
2b58c42c8b Adding changelog entry 2022-07-28 17:30:05 +02:00
Adam Brown
b409431b0f
Merge pull request #6666 from vector-im/feature/adm/missing-space-rooms
`Home` always showing all rooms
2022-07-28 12:10:36 +01:00
Adam Brown
e4640f14d2 adding sdk changelog 2022-07-28 11:06:30 +01:00
Maxime NATUREL
d60683d991
Merge pull request #6664 from vector-im/fix/mna/cancel-infinite-animation
Cancel infinite animations in TypingMessageDotsView
2022-07-28 11:48:26 +02:00
ericdecanini
e6addd1319 Merge remote-tracking branch 'origin/develop' into task/eric/space-switching-unit-tests
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
2022-07-28 11:25:14 +02:00
Adam Brown
2d8ef9925d adding changelog entry 2022-07-28 10:23:14 +01:00
Maxime NATUREL
a0534d8fcc
Merge pull request #6636 from vector-im/feature/mna/ended-state-map-live-location
[Location Share] - Expanded map state when no more live location shares (PSG-629)
2022-07-28 10:53:31 +02:00
Maxime NATUREL
0f6d5aec88 Adding changelog entry 2022-07-28 10:11:35 +02:00
ganfra
050c23b578
Merge pull request #6656 from vector-im/feature/fga/revert_6404
Revert #6404
2022-07-27 17:49:10 +02:00
Adam Brown
01bc275311
Merge pull request #6651 from vector-im/feature/adm/enable-ftue
FTUE - Enable onboarding FTUE flows
2022-07-27 16:38:35 +01:00
ganfra
e9f5208efd Revert "replyTo are not updated if the original message is edited (#6404)"
This reverts commit 99a906fe9b.
2022-07-27 16:39:13 +02:00
ericdecanini
3c8401bc24 Adds changelog file 2022-07-27 16:21:12 +02:00
Adam Brown
0fcf7c7079
Merge pull request #6641 from vector-im/feature/adm/ftue-soft-exit-email-verification
FTUE - Allow editing email during email verification
2022-07-27 14:00:20 +01:00
Jorge Martín
b468a9da33 Improve lock screen implementation. 2022-07-27 14:02:18 +02:00
Adam Brown
91e4536f37 adding changelog entry 2022-07-27 12:54:26 +01:00
Adam Brown
067a030f19
Merge pull request #6649 from vector-im/feature/adm/auth-testing-results
FTUE - Test session feedback
2022-07-27 12:09:35 +01:00
Adam Brown
c153a833aa adding changelog entries 2022-07-27 10:25:25 +01:00
Valere
8e2eb1903d
Merge pull request #6475 from vector-im/feature/bca/crypto_unable_self_verify
Handle case when device cannot be verified
2022-07-26 16:12:43 +02:00
Maxime NATUREL
fb82b1d1ce Adding changelog entry 2022-07-26 15:37:08 +02:00
Adam Brown
796c5052c0 adding changelog entry 2022-07-26 11:59:08 +01:00
Johannes Marbach
e9bd271642
Merge pull request #6634 from vector-im/johannes/ec-permission-shortcuts
Put EC permission shortcuts behind labs flag (PSG-630)
2022-07-25 20:38:22 +02:00
Maxime NATUREL
c3bc53fe48
Merge pull request #6626 from vector-im/feature/mna/open-map-on-tap-of-lls-status-bar
[Location sharing] - OnTap on the top live status bar, display the expanded map view (PSG-614)
2022-07-25 17:40:33 +02:00
Maxime NATUREL
d4186af761
Merge pull request #6608 from vector-im/feature/mna/ux-review-fixes-22-07-11
[Location sharing] - Small improvements of UI for live (PSG-613)
2022-07-25 16:42:48 +02:00
Maxime NATUREL
7509e07df5 Adding changelog entry 2022-07-25 14:23:10 +02:00
Benoit Marty
c28e7c86d4
Merge pull request #6341 from artkoenig/develop
Fixed issues with reporting sync state events from different threads
2022-07-25 10:21:12 +02:00
Johannes Marbach
48217a48fa Add changelog 2022-07-25 10:03:06 +02:00
Maxime NATUREL
d1c631b55c Adding changelog entry 2022-07-25 09:50:54 +02:00
Onuray Sahin
75de805417
Merge pull request #6616 from vector-im/feature/ons/element_call_widget
Support element call widget (PSG-627)
2022-07-22 19:03:03 +03:00
ClaireG
99a906fe9b
replyTo are not updated if the original message is edited (#6404) 2022-07-22 13:35:01 +00:00
Onuray Sahin
6a9b496651
Merge pull request #6609 from vector-im/feature/ons/reset_zoom_level_on_user_focus
Live Location Sharing - Reset zoom level while focusing a user (PSG-624)
2022-07-22 14:50:36 +03:00
Maxime NATUREL
03ebad14c4 Adding changelog entry 2022-07-22 11:54:15 +02:00
Onuray Sahin
b38911751e Changelog added. 2022-07-21 17:28:01 +03:00
Benoit Marty
3d7733156e
Merge pull request #6612 from anoadragon453/patch-1
Fix a typo during registration
2022-07-21 14:12:30 +02:00
Benoit Marty
fabdc20887
Merge pull request #6548 from vector-im/feature/bma/realm_migration_bg
Realm migration bg
2022-07-21 14:08:03 +02:00
Valere
fb05ab34d8
Merge pull request #6395 from vector-im/feature/bca/fix_invalid_qr_warning
Display specific message when verif code malformed
2022-07-21 12:36:46 +02:00
Valere
9f3c8b6e5f Handle case when device cannot be verified 2022-07-21 12:05:33 +02:00
Benoit Marty
b83f6f2cb7 Changelog 2022-07-21 11:19:36 +02:00
Andrew Morgan
96cfcc8229 changelog 2022-07-21 10:16:52 +01:00
ericdecanini
8b220de952 Adds changelog file 2022-07-21 10:50:21 +02:00
Valere
7a3f2bb240 stable name for withheld 2022-07-21 10:01:41 +02:00
ericdecanini
9e1235d51f Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
2022-07-20 16:44:33 +02:00
Onuray Sahin
5c359d4d45 Changelog added. 2022-07-20 16:13:01 +03:00
Onuray Sahin
7f821f1285
Merge pull request #6587 from vector-im/feature/ons/fix_live_location_sharing_permission
Check user power level before sharing live location (PSG-620)
2022-07-20 15:01:32 +03:00
Maxime NATUREL
7639f158d7
Merge pull request #6600 from vector-im/bugfix/mna/lls-ended-too-soon
[Location Share] - Live is considered as ended while still active (PSG-617)
2022-07-20 14:01:05 +02:00
Valere
a8cd77c267
Merge pull request #6585 from vector-im/feature/bca/fix_backup_regression
fix backup looping same keys
2022-07-20 13:52:47 +02:00
Onuray Sahin
26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
Eric Decanini
38ba61f144
Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication
Fixes room not being in space after upgrade
2022-07-20 12:30:42 +02:00
ericdecanini
ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
2022-07-20 10:56:07 +02:00
Maxime NATUREL
a48d33dc3c Adding changelog entry 2022-07-20 09:57:54 +02:00
Valere
51376cc202 add change log 2022-07-20 09:57:31 +02:00
Maxime NATUREL
448b6e1c74
Merge pull request #6539 from vector-im/bugfix/mna/lls-status-bar-disappearing
[Location Share] - Wrong room live location status bar visibility in timeline (PSG-625)
2022-07-20 09:55:06 +02:00
Maxime NATUREL
c3105c8bb1
Merge pull request #6486 from vector-im/feature/mna/delete-lls
[Location sharing] - Delete action on a live message (PSG-523)
2022-07-19 16:43:41 +02:00
Maxime NATUREL
b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events
[Timeline] - Collapse redacted events (PSG-523)
2022-07-19 16:39:45 +02:00
Onuray Sahin
9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps
Share location with other apps (PSG-242)
2022-07-19 17:08:36 +03:00
Benoit Marty
70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review
FTUE - Copy review
2022-07-19 14:49:28 +02:00
Benoit Marty
70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review
FTUE - Combined register copy review
2022-07-19 14:44:29 +02:00
Maxime NATUREL
d2d24cbcbe Adding a changelog entry 2022-07-19 14:43:33 +02:00
Maxime NATUREL
e26759fa89 Adding changelog entry 2022-07-19 14:05:13 +02:00
Maxime NATUREL
578d90e463 Adding changelog entry 2022-07-19 14:04:08 +02:00
Eric Decanini
221cb24de8
Merge pull request #6584 from vector-im/task/eric/new_layout_feature_flag
Adds NewAppLayoutEnabled Feature Flag
2022-07-19 12:24:16 +01:00
Onuray Sahin
8b6e4dd4d4
Merge pull request #6579 from vector-im/feature/ons/fix_remove_live_location_logs
Do not log the live location of the user (PSG-63)
2022-07-19 12:18:58 +03:00
ericdecanini
e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-07-19 11:17:14 +02:00
Onuray Sahin
5fb10ab287 Changelog added. 2022-07-18 18:52:37 +03:00
Benoit Marty
428942d407 Changelog 2022-07-18 17:22:49 +02:00
ericdecanini
b769eafcc3 Adds changelog file 2022-07-18 16:57:54 +02:00
ericdecanini
c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.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
2022-07-18 15:05:04 +02:00
ericdecanini
67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
Benoit Marty
4ed24b5571
Merge pull request #6478 from vector-im/feature/bma/nightly
Nightly build published on Firebase
2022-07-18 14:22:15 +02:00
Onuray Sahin
82fed20145 Changelog added. 2022-07-18 13:53:18 +03:00
Maxime NATUREL
6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
2022-07-18 10:43:43 +02:00
Nikita Fedrunov
79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Benoit Marty
cdbc197426
Merge pull request #6549 from vector-im/feature/bma/fix_6514
Just go back to the timeline if the user is already viewing the DM with the other user.
2022-07-18 09:48:44 +02:00
Maxime NATUREL
cedeb8fa50 Adding changelog entry 2022-07-18 09:43:33 +02:00
Adam Brown
42ceb1f7f2 Merge branch 'feature/adm/ftue-combined-register-copy-review' into feature/adm/ftue-copy-review 2022-07-15 18:09:40 +01:00
Adam Brown
0879e1581c adding changelog entry 2022-07-15 18:09:04 +01:00
Adam Brown
347c07ec35 adding changelog entry 2022-07-15 16:02:46 +01:00
Onuray Sahin
619da0e84d Changelog added. 2022-07-15 15:45:00 +03:00
Valere
e8bd7ea967 fix olm session proliferation 2022-07-15 14:17:44 +02:00
Nikita Fedrunov
c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
Jorge Martín
6c1016caff Fixes wrong voice message being displayed and played on the timeline. 2022-07-14 17:21:16 +02:00
Benoit Marty
d10d8d740f Changelog 2022-07-13 22:48:58 +02:00
Benoit Marty
a85ebbfc34 Run towncrier 2022-07-13 12:42:20 +02:00
Florian Renaud
909ce290c8
Merge pull request #6051 from vector-im/feature/fre/start_dm_on_first_msg
Start DM on first message (UI)
2022-07-12 15:12:17 +02:00
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
2022-07-11 12:03:24 +02:00
Adam Brown
bdc370474e migrating the previous orphaned rooms settings in order to fix the inconsistent value
- only uses the previous value if the key exists, otherwise we end up defaulting to true instead of false (which the preferences screen expects)
- manually deletes the key after migrating the value
2022-07-08 11:20:49 +01:00
Adam Brown
ff2fc3e0a7 adding changelog entry 2022-07-07 13:47:42 +01:00
Adam Brown
67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461
Timeline: fix validation of timeline event changes
2022-07-07 11:25:33 +01:00
Adam Brown
3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463
Fix crashes when opening Thread (#6463)
2022-07-07 11:12:28 +01:00
Adam Brown
4126e6418b
Merge pull request #6469 from vector-im/feature/bma/fix_crash_on_DefaultBackgroundDetectionObserver
Fix ConcurrentModificationException on BackgroundDetectionObserver
2022-07-07 10:58:26 +01:00
Adam Brown
2cbb5306f9 generating 1.4.27 changelog and updating version 2022-07-06 16:11:11 +01:00
Adam Brown
310c4b4a24 Fixing crash when sharing plain text, such as a url 2022-07-06 15:20:43 +01:00
ganfra
6f74f28561 Fix crashes when opening Thread (#6463) 2022-07-06 15:19:40 +01:00
ganfra
6b8bbf2574 Timeline: fix validation of timeline event changes 2022-07-06 15:19:26 +01:00
Benoit Marty
41a3a07bf6 Fix ConcurrentModificationException on BackgroundDetectionObserver 2022-07-06 15:18:52 +01:00
Benoit Marty
253480fd2b Changelog 2022-07-06 15:38:06 +02:00
Adam Brown
89348995c2
Merge pull request #6467 from vector-im/feature/adm/share-text-crash
Crash - Sharing text
2022-07-06 11:24:56 +01:00
Benoit Marty
7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0
Upgrade androidx activity and fragment to 1.5.0
2022-07-06 11:44:22 +02:00
ganfra
0743140973 Fix crashes when opening Thread (#6463) 2022-07-05 17:00:01 +02:00
Benoit Marty
b68e01cda4 Changelog 2022-07-05 12:11:50 +02:00
Adam Brown
3c092c4e2a adding changelog entry 2022-07-05 10:37:41 +01:00
ganfra
f58ba13ef0 Timeline: fix validation of timeline event changes 2022-07-05 10:41:22 +02:00
Benoit Marty
a51d626fe8 Changelog 2022-07-05 09:40:27 +02:00
Adam Brown
2c444527bd
Merge pull request #6447 from cloudrac3r/fix-html-entities
Fix HTML entities being displayed in messages
2022-07-04 17:31:34 +01:00
Benoit Marty
d43c802c90 Changelog 2022-07-04 17:48:35 +02:00
Maxime NATUREL
f3e7d0daff
Merge pull request #6431 from vector-im/fix/mna/closed-poll-visible-votes
[Poll] - Wrong votes in closed poll after removing 2 previous polls (PSG-590)
2022-07-04 11:33:26 +02:00
Maxime NATUREL
906fe8be76
Merge pull request #6425 from vector-im/fix/mna/undisclosed-poll-description
[Poll] - Add a description under undisclosed poll when not ended (PSB-134)
2022-07-04 11:20:59 +02:00
Cadence Ember
b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12:00
Cadence Ember
84bb11c1bf Fix HTML entities being displayed in messages
Initially reported in #6445. Fixes #6445.
This was a regression from #6357.

The fix is to enable Markwon's HTML entities processor.
2022-07-04 01:07:14 +12:00
Benoit Marty
93b7e1094c
Merge pull request #6434 from vector-im/feature/bca/check_serialized_frozen
Simple check to prevent frozen class modificaiton
2022-07-01 18:01:08 +02:00
Valere
8dc57fe2f0
Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages
Share Megolm session keys when inviting a new user
2022-07-01 17:33:43 +02:00