Commit Graph

1762 Commits

Author SHA1 Message Date
Florian Renaud 0f21f404e6 Add changelog 2022-10-25 17:41:36 +02:00
ericdecanini 35be56a44a Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-10-24 10:28:21 -04:00
Jonny Andrew f52aaef645
Add changelog entry 2022-10-21 17:40:09 +01:00
jonnyandrew 31811bb7e0
Fix crash by disabling Flipper on API 22 and below (#7428)
* Disable Flipper on API 21 and below - only affects debug builds.

Due to a bug: https://github.com/facebook/flipper/issues/3572

* Add jonnyandrew to PR sign-off allowlist

Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
2022-10-21 17:36:31 +01:00
ericdecanini f76490130c Adds changelog file 2022-10-20 19:49:37 -04:00
Florian Renaud 8869d82dd0 Add changelog 2022-10-20 23:28:32 +02:00
Florian Renaud 99a2afa5ee Add changelog 2022-10-20 23:03:28 +02:00
Benoit Marty 9122d96fc6 Merge remote-tracking branch 'origin/develop' into develop 2022-10-19 17:17:33 +02:00
Johannes Marbach 451f5f824a
Merge pull request #7369 from vector-im/feature/hughns/qr_code_login
Implement logic for sign in with QR
2022-10-19 17:10:19 +02:00
Benoit Marty 21c30c488c Towncrier 2022-10-19 17:07:11 +02:00
Benoit Marty ff4ec3f583 Fix typo 2022-10-19 10:00:34 +02:00
Benoit Marty f5fe5cce62
Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null
Handle properly when getUser returns null - prefer using getUserOrDefault
2022-10-19 08:40:44 +02:00
Florian Renaud 13972661e0
Merge pull request #7397 from vector-im/feature/fre/voice_broadcast_additional_content
Add additional data in voice broadcast events
2022-10-19 07:51:01 +02:00
Florian Renaud 096b423cc1 Update changelog wording 2022-10-18 22:10:18 +02:00
Florian Renaud 5438c7e089 Add changelog 2022-10-18 21:08:09 +02:00
Florian Renaud a03be5d02f Add changelog 2022-10-18 21:07:44 +02:00
Florian Renaud 0dad78a24a
Merge pull request #7387 from vector-im/feature/fre/voice_broadcast_start_listening
Voice Broadcast - Listening
2022-10-18 17:54:07 +02:00
Florian Renaud b67500515c
Merge pull request #7363 from vector-im/feature/fre/voice_broadcast_start_record
Voice Broadcast - Start record
2022-10-18 16:43:18 +02:00
Florian Renaud e75ddf763b Add changelog file 2022-10-18 13:41:05 +02:00
Florian Renaud 06bceef7c0 Add changelog 2022-10-17 22:33:43 +02:00
Jorge Martín 7793667970 Update changelog 2022-10-17 17:12:16 +02:00
Onuray Sahin 47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui
QR Code Login UI
2022-10-17 17:20:07 +03:00
Benoit Marty 997341b962
Merge pull request #7282 from vector-im/feature/bma/remove_original_event
Stop using `original_event` field
2022-10-17 14:43:22 +02:00
Benoit Marty 36e5166051
Merge pull request #7375 from vector-im/feature/mna/device-manager-go-to-new-screen
[Device Management] Redirect to the new screen everywhere when lab flag is on
2022-10-17 11:44:02 +02:00
Jorge Martin Espinosa f1acb4712c
Fix editing formatted messages in plain text editor (#7360)
* Fix editing formatted messages in plain text editor

* Update changelog.d/7359.sdk

Co-authored-by: Benoit Marty <benoitm@matrix.org>

Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-14 15:15:12 +00:00
Maxime NATUREL 612d2e51e5
Merge pull request #7361 from vector-im/feature/mna/device-manager-unknown-verification-status
[Device management] Update the unknown verification status icon (PSG-824)
2022-10-14 16:22:33 +02:00
Maxime NATUREL ec5964bc20
Merge pull request #7352 from vector-im/feature/mna/device-manager-lab-flag-account-data
[Device management] Add lab flag for matrix client info account data event (PSG-800)
2022-10-14 16:03:40 +02:00
Hugh Nimmo-Smith f999e72759 Changelog 2022-10-14 14:01:13 +01:00
Onuray Sahin b04ad4915f Add changelog. 2022-10-14 15:38:28 +03:00
Maxime NATUREL 1f0028fd7e Adding changelog entry 2022-10-14 14:09:30 +02:00
Benoit Marty 8bb5dcd553 Changelog 2022-10-14 12:33:27 +02:00
Hugh Nimmo-Smith 626e3dbd10
Merge pull request #7358 from vector-im/feature/hughns/qr_code_login_task 2022-10-14 09:38:07 +01:00
Jorge Martin Espinosa 81ef1415dc
Apply design changes to WYSIWYG editor (#7354)
* Apply design changes to WYSIWYG editor

* Add changelog

* Remove unneeded attribute in RichTextComposerLayout

* Fix lint issues

* Fix style naming issue.

* Change rich text editor border radius depending on the number of lines.

* Replace standby voice recorder icon.
2022-10-14 09:59:43 +02:00
Hugh Nimmo-Smith f13419d696 Changelog 2022-10-13 15:18:31 +01:00
Benoit Marty 5b56ae1e1c
Merge pull request #7319 from ByeongsuPark/feature/bspark/bugfix-wrong-mic-direction-rtl
Fix the wrong mic button direction to cancel on RTL languages
2022-10-13 13:59:09 +02:00
Maxime NATUREL f9eb6a64ea
Merge pull request #7323 from vector-im/feature/mna/device-manager-parsing-os
[Device management] Improve the parsing for OS of Desktop/Web sessions (PSG-823)
2022-10-13 10:39:38 +02:00
Maxime NATUREL 893008a93d Adding changelog entry 2022-10-13 10:13:10 +02:00
Maxime NATUREL 1ede6b32a5 Adding changelog entry 2022-10-13 09:41:53 +02:00
Eric Decanini 963c0e5a50
Local Notification Settings Event (#7300)
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Links notification settings toggle to pusher service

* Adds changelog file

* Adds error handling to VectorSettingsNotificationPreferenceFragment

* Removes comment in FakePushersService

* Adds parsing for LocalNotificationSettings event

* Adds changelog file

* Fixes post merge errors

* Fixes imports and improves string name

* Fixes legal copies

* Fixes kdoc punctuation

* Fixes string error

* Removes unused imports

* Moves LocalNotificationSettingsContent

* Fixes lint errors

* Fixes test errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Adds lost tests

* Adds PusherEntity migration

* Fixes session overview layout overlap

* Fixes switch being enabled by default

* Adds device id and unstable prefix
2022-10-12 23:11:27 -04:00
Maxime NATUREL f8f416e979
Merge pull request #7306 from vector-im/feature/mna/device-manager-extended-details
[Device Management] Render extended device info (PSG-773)
2022-10-12 18:09:33 +02:00
Benoit Marty beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow
Remove Arrow-kt dependency
2022-10-12 16:26:02 +02:00
Maxime NATUREL 7877ef92cc
Merge pull request #7325 from vector-im/feature/mna/device-manager-hide-ip-current-session
[Device management] Hide the IP address and last activity date on current session (PSG-823)
2022-10-12 15:56:30 +02:00
Maxime NATUREL 6626732b3b
Merge pull request #7276 from vector-im/feature/mna/device-manager-account-data
[Device Management] Save matrix_client_information events on login/registration (PSG-769, PSG-771)
2022-10-12 15:41:40 +02:00
Eric Decanini 9857fa6ca4
Makes "Enable Notifications for this session" respond to enabled value in pusher (#7281)
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Links notification settings toggle to pusher service

* Adds changelog file

* Adds error handling to VectorSettingsNotificationPreferenceFragment

* Removes comment in FakePushersService

* Fixes post merge errors

* Fixes imports and improves string name

* Fixes legal copies

* Fixes kdoc punctuation

* Fixes string error

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Adds lost tests

* Adds PusherEntity migration

* Fixes session overview layout overlap

* Fixes switch being enabled by default

* Binds entire view to toggle switch
2022-10-12 09:27:55 -04:00
Benoit Marty 1669316682 Remove dependency to arrow. Please use `org.matrix.android.sdk.api.util.Optional` instead. 2022-10-12 10:20:52 +02:00
Maxime NATUREL 052b497ebe Adding new changelog entry 2022-10-11 17:47:24 +02:00
Jorge Martin Espinosa def67b2e7d
Integrate WYSIWYG editor (#7288)
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
2022-10-11 17:05:47 +02:00
Maxime NATUREL 8cd8c65442 Adding changelog entry 2022-10-11 15:23:47 +02:00
Maxime NATUREL a640c77141 Adding changelog entry 2022-10-11 15:23:22 +02:00
Maxime NATUREL 1e87621e48 Adding changelog entry 2022-10-11 14:01:43 +02:00
Eric Decanini 2fe636e93b
Adds Push Notification toggle to Device Manager (#7261)
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Fixes post merge errors

* Fixes legal copies

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error
2022-10-10 19:21:34 -04:00
Maxime NATUREL 6cc6be4d53 Adding changelog entry 2022-10-10 15:21:56 +02:00
ByeongsuPark e9bde89fec Add changelog.d
Signed-off-by: byeongsu@soongsil.ac.kr <byeongsu@soongsil.ac.kr>
2022-10-10 17:05:12 +09:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
Maxime NATUREL 9827ffb1e5
Merge pull request #7312 from vector-im/fix/mna/device-manager-long-session-name
[Device Management] Long session names not rendered well (PSG-820)
2022-10-07 15:57:12 +02:00
Maxime NATUREL 3ceb19486a Adding changelog entry 2022-10-07 11:29:33 +02:00
Florian Renaud 8d3d275921 Add changelog file 2022-10-06 16:28:38 +02:00
Florian Renaud 0c5d4c5f12 Add changelog file 2022-10-06 16:25:56 +02:00
Benoit Marty 9335242ce1
Merge pull request #7285 from vector-im/tech/split-timelinefragment
Refactor: split TimelineFragment into MessageComposerFragment and VoiceRecorderFragment
2022-10-05 17:31:10 +02:00
Benoit Marty 80c210e62d
Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons
[Device Management] Show correct device type icons (PSG-775)
2022-10-05 17:30:42 +02:00
Benoit Marty 94fa3343b4 Run towncrier 2022-10-05 17:06:58 +02:00
Valere 502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification
E2ee dos not hinder verification
2022-10-05 14:34:34 +02:00
Valere ec7c8c8b31
Merge pull request #6726 from vector-im/feature/bca/block_unverified
Per room block unverified devices
2022-10-05 14:29:59 +02:00
Amit Kumar aad2eed396
Add initial Sentry setup for crashes and perf tracking (#7141)
* Add initial Sentry setup for crashes and perf tracking

* Fix failing analytics tests

* Reformat code to fix style issue

* Close sentry when user signs out

* Add initial unit tests for Sentry

* Remove unused import

* Exclude amitkma from signoff requirements for PRs
2022-10-05 16:49:14 +05:30
Jorge Martín e6a2d50b92 Add changelog, address review comments. 2022-10-05 12:55:46 +02:00
Benoit Marty a036cc6d75
Merge pull request #7287 from vector-im/feature/bma/en-us
Use American English by default.
2022-10-05 11:02:58 +02:00
Valere 37458d41f2 E2ee dos not hinder verification 2022-10-05 10:42:29 +02:00
Valere e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
Maxime NATUREL 5c95cee1c6 Adding changelog entry 2022-10-05 10:13:14 +02:00
ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881
# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
2022-10-04 14:05:23 -04:00
Benoit Marty 4974fdf905
Merge pull request #6633 from Benjiko99/feature/incognito-keyboard
Add privacy setting to disable personalized learning by the keyboard
2022-10-04 18:22:22 +02:00
SpiritCroc af9548dfdd
Support inline images in the timeline (#5877)
* Support inline images in the timeline

Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-04 17:59:52 +02:00
Benoit Marty 2cb16d9f11
Merge pull request #6215 from networkException/fix-animated-only-fetching-thumbnail
Fix animated images only autoplaying sometimes
2022-10-04 17:44:25 +02:00
Benoit Marty ca6813b5d8
Merge pull request #6906 from bwi-de/develop
Clean up pin code key and biometrics key on logout
2022-10-04 16:19:03 +02:00
Benoit Marty 304fb09f57
Merge pull request #6757 from eidonia/bugfix/#5029-disbale-emoji-keyboard-not-applies-reply
[Bugfix #5029] disable emoji keyboard not applies to reply
2022-10-04 16:16:36 +02:00
Benoit Marty fe3540f6eb Changelog 2022-10-04 15:51:29 +02:00
Paul d205202e52
[Bugfix] Fix crash on previewing image to upload on Android P (#7184)
* Fix crash on image upload preview on Android P

Using hardware bitmap allocation on Android framework versions prior to
Android Q causes a crash when decoding a bitmap if GL context wasn't
initialised. The issue is not documented in ImageDecoder reference but
it is mentioned in the comments of glide[1] with a link to internal
google discussion.

[1] f83cc274b4/library/src/main/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigState.java (L22)

Signed-off-by: Paweł Matuszewski <pamat@protonmail.com>
2022-10-04 15:34:13 +02:00
Benoit Marty 81b5fcdc7d
Merge pull request #5716 from thefirstofthe300/styling-tweaks
Styling tweaks
2022-10-04 15:32:32 +02:00
Yoan Pintas ef82cc6aa7
Merge pull request #7225 from vector-im/yostyle/fix_strandhogg_detection
Add Activities of android permission controller in the whitelist
2022-10-04 11:51:06 +02:00
Florian Renaud 8e3b9735c1
Merge pull request #7258 from vector-im/feature/fre/voice_broadcast_feature_flag
Voice Broadcast - Add a feature flag with the composer action
2022-10-04 11:25:33 +02:00
Benoit Marty d7f66d993f Changelog 2022-10-04 09:55:05 +02:00
Maxime NATUREL 07a2e3254a
Merge pull request #7110 from vector-im/feature/mna/devices-learn-more-bottom-sheet
[Device Management] Learn more bottom sheets (PSG-715)
2022-10-03 17:39:41 +02:00
Nikita Fedrunov 9f8c7688bf
added analytics for app layout (#7242) 2022-10-03 11:47:58 +02:00
Valere 005e712396
Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning
warn on cross signing reset
2022-10-03 09:25:52 +02:00
Florian Renaud 2812b16cad Add changelog file 2022-10-03 09:25:03 +02:00
Onuray Sahin d0dd446af8
Merge pull request #7247 from vector-im/feature/ons/parse_user_agent
[Device Manager] Parse user agents (PSG-762)
2022-09-30 18:36:33 +03:00
Valere 384e829d42
Update changelog.d/6702.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-09-30 17:16:49 +02:00
Valere c8f0792997 warn on cross signing reset 2022-09-30 16:00:34 +02:00
Maxime NATUREL 6eb5d98180 Add changelog entry 2022-09-29 14:06:43 +02:00
Onuray Sahin 1238f31cdf
Merge pull request #7209 from vector-im/feature/ons/extend_user_agent
[Device Manager] Extend user agent to include device information (PSG-755)
2022-09-29 13:11:20 +03:00
Onuray Sahin 0f0ec54ed1 Code review fixes. 2022-09-29 12:20:01 +03:00
Onuray Sahin 7a36b10d40 Add changelog. 2022-09-28 18:22:24 +03:00
Maxime NATUREL 320e9eac39 Adding changelog entry 2022-09-27 15:04:33 +02:00
Adam Brown fad02062d8
Instrumentation test coroutines (#7207)
Converting SDK instrumentation tests from CountdownLatch to suspending functions
2022-09-27 13:37:23 +01:00
Benoit Marty 4d09f0888d
Merge pull request #7231 from pt2121/pt/12-flip-table
Add support for `/tableflip` command (#12)
2022-09-27 11:11:08 +02:00
Nikita Fedrunov e9d1a9e04e
app layout labs flag is enabled by default (#7237) 2022-09-27 09:54:24 +02:00
yostyle bd64749b48 Add changelog 2022-09-27 00:24:33 +02:00
Prat T 3f9b9827bd
Add support for `/tableflip` command (#12)
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
2022-09-26 07:25:34 -07:00
Adam Brown 469dd46a45 adding changelog entry 2022-09-26 10:26:39 +01:00
Maxime NATUREL 45b72483fe Adding changelog entry 2022-09-26 09:46:58 +02:00
Artjom König 2dda8af776
Merge branch 'vector-im:develop' into develop 2022-09-26 08:52:08 +02:00
Tomáš Beňo 79e4a435da Add privacy setting to disable personalized learning by the keyboard 2022-09-25 13:23:32 +02:00
Maxime NATUREL 0cd352ccba Adding changelog entry 2022-09-23 16:39:41 +02:00
Onuray Sahin 33eeb721bf Merge branch 'develop' into feature/ons/extend_user_agent 2022-09-23 16:17:06 +03:00
Onuray Sahin 7cd30a1ed4 Merge branch 'develop' into feature/ons/device_manager_security_sessions 2022-09-23 16:16:49 +03:00
Benoit Marty 56189a2d5d
Merge pull request #7211 from vector-im/feature/bma/prevent_modification_of_translations
Prevent modification of translations
2022-09-23 10:46:38 +02:00
ericdecanini 5c27f65d3e Adds changelog file 2022-09-22 20:43:37 -04:00
Benoit Marty c56f33a939 Add changelog 2022-09-22 17:36:08 +02:00
Benoit Marty 60bfd0dd42
Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning
Fix lint warning
2022-09-22 17:35:10 +02:00
Benoit Marty f4c5cba020
Merge pull request #7126 from vector-im/feature/bma/arch_doc
Architecture doc
2022-09-22 16:41:17 +02:00
Adam Brown 65156a8ece
Merge pull request #7198 from vector-im/feature/adm/configurable-sync-timeout
Allow configurable sync timeout
2022-09-22 15:40:58 +01:00
Benoit Marty 0910b118ff Changelog 2022-09-22 16:32:14 +02:00
Benoit Marty 151f6245db
Merge pull request #6929 from vector-im/feature/bma/android12
Target API 32 (Android 12)
2022-09-22 16:30:04 +02:00
Onuray Sahin 8b3eaf10e1 Add changelog. 2022-09-22 15:25:31 +03:00
Benoit Marty e98bfe5c9b
Merge pull request #7156 from vector-im/feature/mna/device-manager-verify-other-session
[Device management] Verify another session (PSG-722)
2022-09-22 11:46:28 +02:00
Benoit Marty 4e30bc86b8
Merge pull request #7139 from vector-im/feature/mna/device-manager-verify-current-session
[Device management] Verify current session (PSG-722)
2022-09-22 11:46:07 +02:00
Adam Brown d75e37966c adding changelog entry 2022-09-21 15:39:13 +01:00
Benoit Marty b9c28ba4ce
Merge branch 'develop' into feature/bma/android12 2022-09-21 16:24:30 +02:00
Benoit Marty d31d833959
Merge pull request #7180 from vector-im/feature/fre/deferred_dm_labs_flag
Deferred DMs - Add and enable the feature by default in the labs settings
2022-09-21 12:17:19 +02:00
Florian Renaud 3786bd9c65 changelog 2022-09-21 09:36:07 +02:00
ericdecanini 821636bcb2 Adds changelog file 2022-09-20 18:36:25 -04:00
Onuray Sahin 45cf7dcd63 Merge branch 'develop' into feature/ons/device_manager_security_sessions 2022-09-20 17:11:51 +03:00
Florian Renaud 8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout
Deferred DMs - Handle the local rooms within the new AppLayout
2022-09-20 10:53:51 +02:00
Maxime NATUREL c16e1ca291 Adding changelog entry 2022-09-20 10:46:10 +02:00
Maxime NATUREL fa990351af Editing changelog entry 2022-09-20 10:45:46 +02:00
Maxime NATUREL 81beccdd8e Adding changelog entry 2022-09-20 10:45:46 +02:00
Benoit Marty b7c63907ea
Merge pull request #7108 from vector-im/feature/bma/trybuildjet
Use `buildjet-4vcpu-ubuntu-2204` runner instead of `macos-latest` to …
2022-09-20 09:51:46 +02:00
Benoit Marty d8ff688e76
Fix typo in changelog.
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2022-09-20 09:51:22 +02:00
Eric Decanini 7d2cbf5263
Merge pull request #7166 from vector-im/feature/eric/enable-app-layout-labs
Enables New App Layout in Labs
2022-09-19 13:35:40 -04:00
Florian Renaud b4ca16735d
Merge pull request #7125 from vector-im/feature/fre/start_dm_loading
Deferred DM - Add a loading wheel while creating the DM
2022-09-19 17:04:56 +02:00
Florian Renaud c28271dd8b Add changelog 2022-09-19 15:58:14 +02:00
Onuray Sahin 72cc0deda2 Add changelog. 2022-09-19 16:45:52 +03:00
Nikita Fedrunov 830e5ffa9f
room summary now has constant height (#7145) 2022-09-19 15:22:16 +02:00
Onuray Sahin 32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
Florian Renaud 10b5e8fd04 Changelog 2022-09-19 09:38:05 +02:00
ericdecanini 57c9161e00 Adds changelog file 2022-09-17 13:17:39 -04:00
Benoit Marty d4eb619d40 Changelog 2022-09-16 23:30:20 +02:00
Benoit Marty 0685fb1e1a Changelog 2022-09-16 19:03:39 +02:00
Benoit Marty 73e061e472
Merge pull request #7130 from vector-im/feature/bma/fix_verification
Fix empty verification bottom sheet
2022-09-16 19:00:39 +02:00
Adam Brown 9a298a6e3e
Merge pull request #7157 from vector-im/feature/adm/cache-misses
Fix build cache misses
2022-09-16 17:19:49 +01:00
Benoit Marty a919989fd4
Merge pull request #7132 from vector-im/bugfix/eric/dismiss-new-chat
Adds dismissal to new chat bottom sheet actions
2022-09-16 18:14:08 +02:00
Adam Brown 1669320698 adding changelog entry 2022-09-16 15:03:24 +01:00
Onuray Sahin 61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-09-16 15:25:09 +03:00
Adam Brown ae50f5a006 adding changelog entry 2022-09-16 11:37:39 +01:00
Adam Brown b05d52bb6d
Merge pull request #6788 from vector-im/feature/adm/app-level-variant-v2
`:vector-app` level variants
2022-09-16 10:36:58 +01:00
Florian Renaud 0ce72057dc
Merge pull request #7123 from vector-im/bugfix/fre/start_dm_room_list_glitch
Start DM - Fix glitch in the room list
2022-09-15 16:55:47 +02:00
ericdecanini 13b1722060 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
2022-09-15 10:05:13 -04:00
Eric Decanini 01e1d74c72
Merge pull request #7103 from vector-im/bugfix/eric/landscape-bottom-sheet-peek
[New Layout] Adds peek height (min height) to new layout bottom sheets
2022-09-15 10:03:11 -04:00
ericdecanini e9b3d29128 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat 2022-09-15 10:02:41 -04:00
Adam Brown 32a15bee04 adding changelog entry 2022-09-15 14:50:08 +01:00