Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix QR login support with cryptoV2 #1823

Merged
merged 4 commits into from
Oct 3, 2023
Merged

Fix QR login support with cryptoV2 #1823

merged 4 commits into from
Oct 3, 2023

Conversation

BillCarsonFr
Copy link
Member

Pull Request Checklist

Fixes https://github.com/vector-im/customer-retainer/issues/113
Depends on matrix-org/matrix-rust-sdk#2641

@stefanceriu stefanceriu force-pushed the valere/fix_qr_login_rust branch from 9096f1d to 9200f84 Compare October 2, 2023 11:18
stefanceriu
stefanceriu approved these changes Oct 3, 2023
View reviewed changes
Copy link
Member

@stefanceriu stefanceriu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this and it's working great, the code looks good to me as well. I think we can go ahead an merge it but please have another look too

MatrixSDK/Crypto/MXCryptoV2.swift Outdated Show resolved Hide resolved
MatrixSDK/Crypto/MXCryptoV2.swift Outdated Show resolved Hide resolved
@stefanceriu stefanceriu marked this pull request as ready for review October 3, 2023 10:16
@codecov
Copy link

codecov bot commented Oct 3, 2023 •
edited
Loading

Codecov Report

Attention: 47 lines in your changes are missing coverage. Please review.

Comparison is base (2b1e26c) 35.63% compared to head (703918b) 35.62%.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #1823      +/-   ##
===========================================
- Coverage    35.63%   35.62%   -0.02%     
===========================================
  Files          617      617              
  Lines        96959    96996      +37     
  Branches     41457    41479      +22     
===========================================
+ Hits         34553    34555       +2     
- Misses       61484    61518      +34     
- Partials       922      923       +1
Files Coverage Δ
...s/Crypto/CryptoMachine/MXCryptoProtocolStubs.swift 49.05% <0.00%> (-0.95%) ⬇️
...trixSDK/Crypto/CryptoMachine/MXCryptoMachine.swift 44.32% <0.00%> (-0.93%) ⬇️
MatrixSDK/Crypto/MXCryptoV2.swift 45.87% <0.00%> (-1.62%) ⬇️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@stefanceriu stefanceriu merged commit 8e94b7b into develop Oct 3, 2023
4 checks passed
@stefanceriu stefanceriu deleted the valere/fix_qr_login_rust branch October 3, 2023 14:20
Topheee added a commit to Topheee/matrix-ios-sdk that referenced this pull request Mar 27, 2024
@Topheee
Squashed commit of the following:
2808b41 
commit a4b403f
Author: Christopher Kobusch <[email protected]>
Date:   Wed Mar 27 20:30:07 2024 +0100

    Fix Index OOB after interrupted DB commit

commit 8639971
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 12:33:22 2024 +0200

    Prepare for new sprint

commit 73b8b72
Merge: 97f335b 9e6a0da
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 12:33:20 2024 +0200

    Merge branch 'master' into develop

commit 9e6a0da
Merge: 801747c 184b907
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 12:33:15 2024 +0200

    Merge branch 'release/0.27.6/master'

commit 184b907
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 12:33:15 2024 +0200

    finish version++

commit fffa162
Merge: 801747c 8da77d3
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 12:17:16 2024 +0200

    Merge pull request matrix-org#1844 from matrix-org/release/0.27.6/release

    Release 0.27.6

commit 8da77d3
Author: Stefan Ceriu <[email protected]>
Date:   Wed Feb 7 11:03:33 2024 +0200

    version++

commit 97f335b
Author: Mauro Romito <[email protected]>
Date:   Tue Jan 9 12:32:46 2024 +0100

    Prepare for new sprint

commit dc6adea
Merge: 19f5acd 801747c
Author: Mauro Romito <[email protected]>
Date:   Tue Jan 9 12:32:44 2024 +0100

    Merge branch 'master' into develop

commit 801747c
Merge: dbec252 5e23250
Author: Mauro Romito <[email protected]>
Date:   Tue Jan 9 12:32:39 2024 +0100

    Merge branch 'release/0.27.5/master'

commit 5e23250
Author: Mauro Romito <[email protected]>
Date:   Tue Jan 9 12:32:39 2024 +0100

    finish version++

commit 08fcf6f
Merge: dbec252 d2bbd1a
Author: Mauro <[email protected]>
Date:   Tue Jan 9 12:31:33 2024 +0100

    Merge pull request matrix-org#1841 from matrix-org/release/0.27.5/release

commit d2bbd1a
Author: Mauro Romito <[email protected]>
Date:   Tue Jan 9 11:59:51 2024 +0100

    version++

commit 19f5acd
Author: Yoan Pintas <[email protected]>
Date:   Wed Dec 6 09:48:17 2023 +0000

    Update regex for email address (matrix-org#1826)

    * Update regex for email address

    * Add changelog

    Signed-off-by: yostyle <[email protected]>

    * Add unit test

    * rename changelog

    ---------

    Signed-off-by: yostyle <[email protected]>

commit f666b8f
Author: Doug <[email protected]>
Date:   Tue Nov 28 13:04:36 2023 +0000

    Update CocoaPods and other gems. (matrix-org#1835)

commit d94aaf4
Author: Doug <[email protected]>
Date:   Tue Nov 28 10:11:05 2023 +0000

    Prepare for new sprint

commit afa2981
Merge: f72d833 dbec252
Author: Doug <[email protected]>
Date:   Tue Nov 28 10:11:03 2023 +0000

    Merge branch 'master' into develop

commit dbec252
Merge: ebae216 dbdc541
Author: Doug <[email protected]>
Date:   Tue Nov 28 10:10:58 2023 +0000

    Merge branch 'release/0.27.4/master'

commit dbdc541
Author: Doug <[email protected]>
Date:   Tue Nov 28 10:10:58 2023 +0000

    finish version++

commit d4130a1
Merge: ebae216 99894c2
Author: Doug <[email protected]>
Date:   Tue Nov 28 10:10:23 2023 +0000

    Merge pull request matrix-org#1834 from matrix-org/release/0.27.4/release

    Release 0.27.4

commit 99894c2
Author: Doug <[email protected]>
Date:   Tue Nov 28 09:31:24 2023 +0000

    version++

commit f72d833
Author: Doug <[email protected]>
Date:   Thu Nov 23 17:24:47 2023 +0000

    Fix unhandled callback when the session is nil. (matrix-org#1833)

commit c91b556
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 08:17:18 2023 +0300

    Prepare for new sprint

commit 73c331c
Merge: 8e94b7b ebae216
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 08:17:15 2023 +0300

    Merge branch 'master' into develop

commit ebae216
Merge: 3b93a03 37784b5
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 08:17:11 2023 +0300

    Merge branch 'release/0.27.3/master'

commit 37784b5
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 08:17:11 2023 +0300

    finish version++

commit 95edebc
Merge: 3b93a03 2fef303
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 08:16:27 2023 +0300

    Merge pull request matrix-org#1824 from matrix-org/release/0.27.3/release

    Release 0.27.3

commit 2fef303
Author: Stefan Ceriu <[email protected]>
Date:   Wed Oct 4 07:30:57 2023 +0300

    version++

commit 8e94b7b
Merge: 2b1e26c 703918b
Author: Stefan Ceriu <[email protected]>
Date:   Tue Oct 3 17:20:54 2023 +0300

    Merge pull request matrix-org#1823 from matrix-org/valere/fix_qr_login_rust

    Fix QR login support with cryptoV2

commit 703918b
Author: Stefan Ceriu <[email protected]>
Date:   Tue Oct 3 13:35:46 2023 +0300

    Fix broken MXCrypto stub

commit 4ce13d2
Author: Stefan Ceriu <[email protected]>
Date:   Tue Oct 3 13:15:50 2023 +0300

    Cleanup

commit 9200f84
Author: Stefan Ceriu <[email protected]>
Date:   Mon Oct 2 13:43:46 2023 +0300

    Bump the MatrixSDKCrypto to 0.3.13

commit d798299
Author: Valere <[email protected]>
Date:   Fri Sep 29 09:21:27 2023 +0200

    Fix QR login support with cryptoV2

commit 2b1e26c
Author: Stefan Ceriu <[email protected]>
Date:   Fri Sep 29 11:41:11 2023 +0300

    Fix typos following previously merged PR returns

commit 0ba502f
Author: Stefan Ceriu <[email protected]>
Date:   Fri Sep 29 10:34:14 2023 +0300

    Fix typos following previously merged PR

commit 00a864b
Merge: 626e03f 3bed914
Author: Stefan Ceriu <[email protected]>
Date:   Fri Sep 29 08:28:18 2023 +0300

    Merge pull request matrix-org#1822 from NicolasBuquet/develop

    Prevent crash when sending file with unrecognised file extension (no …

commit 3bed914
Author: Nicolas Buquet <[email protected]>
Date:   Fri Sep 29 06:56:23 2023 +0200

    Fix incorrect @ NSString marker

commit 626e03f
Author: Doug <[email protected]>
Date:   Thu Sep 28 10:00:21 2023 +0100

    Update cocoapods to 1.13.0. (matrix-org#1820)

commit 36a9d9c
Author: Nicolas Buquet <[email protected]>
Date:   Wed Sep 27 16:28:39 2023 +0200

    Prevent crash when sending file with unrecognised file extension (no associated mime type)

    Signed-off-by: Nicolas Buquet <[email protected]>

commit 8bf8711
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:45:24 2023 +0300

    Prepare for new sprint

commit c08d06b
Merge: 8942e15 3b93a03
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:45:22 2023 +0300

    Merge branch 'master' into develop

commit 3b93a03
Merge: 8ada89c d6448db
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:45:17 2023 +0300

    Merge branch 'release/0.27.2/master'

commit d6448db
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:45:17 2023 +0300

    finish version++

commit 5bd854d
Merge: 8ada89c f3047ae
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:44:20 2023 +0300

    Merge pull request matrix-org#1817 from matrix-org/release/0.27.2/release

    Release 0.27.2

commit f3047ae
Author: Stefan Ceriu <[email protected]>
Date:   Tue Sep 12 09:15:37 2023 +0300

    version++

commit 8942e15
Merge: cfca47d 96f7bc3
Author: Valere <[email protected]>
Date:   Fri Sep 8 13:44:42 2023 +0200

    Merge pull request matrix-org#1816 from matrix-org/bca/fix_qr_scanning

    Fix passing padded base64 instead of unpadded

commit 96f7bc3
Author: valere <[email protected]>
Date:   Fri Sep 8 11:46:24 2023 +0200

    update changelog

commit efa2888
Author: Valere <[email protected]>
Date:   Fri Sep 8 11:40:51 2023 +0200

    Fix passing padded base64 instead of unpadded

commit cfca47d
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 12:07:22 2023 +0300

    Prepare for new sprint

commit 47c9da4
Merge: 8b5256c 8ada89c
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 12:07:20 2023 +0300

    Merge branch 'master' into develop

commit 8ada89c
Merge: e86b0d1 5e88f5e
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 12:07:15 2023 +0300

    Merge branch 'release/0.27.1/master'

commit 5e88f5e
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 12:07:15 2023 +0300

    finish version++

commit 0e476d5
Merge: e86b0d1 6aaa245
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 12:05:47 2023 +0300

    Merge pull request matrix-org#1815 from matrix-org/release/0.27.1/release

    Release 0.27.1

commit 6aaa245
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 29 11:13:47 2023 +0300

    version++

commit 8b5256c
Merge: e03fa9d 6208987
Author: Mauro <[email protected]>
Date:   Fri Aug 25 19:33:30 2023 +0200

    Merge pull request matrix-org#1813 from matrix-org/mauroromito/helper_function_to_generate_mas_logout_url

    Helper function to generate the logout url for devices on MAS

commit 6208987
Author: Mauro Romito <[email protected]>
Date:   Fri Aug 25 19:32:57 2023 +0200

    code improvement

commit df726ee
Author: Mauro Romito <[email protected]>
Date:   Fri Aug 25 17:19:09 2023 +0200

    changelog

commit ece3059
Author: Mauro Romito <[email protected]>
Date:   Fri Aug 25 17:09:52 2023 +0200

    helper function to generate the logout url

commit e03fa9d
Author: Mauro Romito <[email protected]>
Date:   Fri Aug 25 17:11:48 2023 +0200

    Revert "helper function to generate the logout url"

    This reverts commit 5fc236c.

commit 5fc236c
Author: Mauro Romito <[email protected]>
Date:   Fri Aug 25 17:09:52 2023 +0200

    helper function to generate the logout url

commit 7c04167
Merge: bb02714 099bc05
Author: Mauro <[email protected]>
Date:   Thu Aug 24 17:16:51 2023 +0200

    Merge pull request matrix-org#1812 from matrix-org/mauroromito/well_known_authentication_property

    Added the authentication property to the well known

commit 099bc05
Author: Mauro Romito <[email protected]>
Date:   Thu Aug 24 17:16:07 2023 +0200

    changelog

commit 97ae3b1
Author: Mauro Romito <[email protected]>
Date:   Thu Aug 24 16:35:03 2023 +0200

    added the authentication property to the well known

commit bb02714
Merge: 33b67a5 9964bfe
Author: Mauro <[email protected]>
Date:   Wed Aug 23 19:47:04 2023 +0200

    Merge pull request matrix-org#1811 from matrix-org/mauroromito/support_delegate_oidc_compatibility

    delegate OIDC compatibility flag added

commit 9964bfe
Author: Mauro Romito <[email protected]>
Date:   Wed Aug 23 19:46:41 2023 +0200

    renaming

commit d70e4c4
Author: Mauro Romito <[email protected]>
Date:   Wed Aug 23 19:28:50 2023 +0200

    changelog

commit 2411a37
Author: Mauro Romito <[email protected]>
Date:   Wed Aug 23 19:27:06 2023 +0200

    compatibility

commit 33b67a5
Merge: 71631c1 ff18f2f
Author: Stefan Ceriu <[email protected]>
Date:   Wed Aug 23 16:02:54 2023 +0300

    Merge pull request matrix-org#1809 from matrix-org/stefan/variousBugFixes

    Various bug fixes

commit ff18f2f
Author: Stefan Ceriu <[email protected]>
Date:   Wed Aug 23 16:02:19 2023 +0300

    Add changelogs

commit b4d682f
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 22 14:41:45 2023 +0300

    Fixes #7636 - Sound stopped working on push notifications

commit 42a57e0
Author: Stefan Ceriu <[email protected]>
Date:   Tue Aug 22 13:21:15 2023 +0300

    Prevent keyed archiver encoding crashes when writing read receipts to the file store

commit 2adb8c2
Author: Stefan Ceriu <[email protected]>
Date:   Mon Aug 21 10:44:32 2023 +0300

    Fix power level events force unwrap crash

commit 71631c1
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:54:33 2023 +0100

    Prepare for new sprint

commit 3d7eb9e
Merge: 24f080d e86b0d1
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:54:31 2023 +0100

    Merge branch 'master' into develop

commit e86b0d1
Merge: 94d8e25 ada86bf
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:54:26 2023 +0100

    Merge branch 'release/0.27.0/master'

commit ada86bf
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:54:26 2023 +0100

    finish version++

commit 2430829
Merge: 94d8e25 4e6e57d
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:53:44 2023 +0100

    Merge pull request matrix-org#1808 from matrix-org/release/0.27.0/release

    Release 0.27.0

commit 4e6e57d
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:13:23 2023 +0100

    Missing changelog entries.

commit 7ba9e35
Author: Doug <[email protected]>
Date:   Tue Aug 15 09:07:16 2023 +0100

    version++

commit 24f080d
Author: Stefan Ceriu <[email protected]>
Date:   Sat Aug 12 09:47:37 2023 +0300

    Device dehydration v2 (matrix-org#1807)

    * Device dehydration v2
    - add support for device dehydration v2 i.e. `org.matrix.msc3814`
    - implement rest client methods and models
    - implement flows for creating and storing the dehydrated device pickle in in 4s as well as recovering it to use for device rehydration
    - implement methods for creating, retrieving, deleting dehydrated devices as well as consuming the messages stored on the backend in between sessions
    - delete previous implementation

    * Bump MatrixSDKCrypto to 0.3.12 - adopt latest API changes and URL encode the deviceId when requesting dehydrated device events

    * Address PR review comments

    * Attempt to fix the CI

    * Drop down to Xcode 14.2 in an attempt to fix the linting

commit b9e6b22
Author: Stefan Ceriu <[email protected]>
Date:   Fri Jul 21 09:08:55 2023 +0300

    Matrix sdk crypto update (matrix-org#1805)

    * Fix various changes following MatrixSDKCrypto update (not linked here)

    * Fix crash caused by unexpected ffi result when processing to device events

    * Fix broken secret recovery following uniffi change
    - previously the UserIdentity used to be defined through the UDL file and the order of the userSigning and selfSigning keys were different from the place where they were implemented
    - switching from the UDL to the uniffi macro switched them back to the correct order, but that didn't cause any breaking changes api side
    - as a result secret recovery would fail as the secrets wouldn't match for user and self signing

    * Adopt safer to device event sync result handling

    * Bump MatrixSDKCrypto to v0.3.11

    * Fix unit tests

commit f214fea
Merge: 5f35db6 191ae5a
Author: Alfonso Grillo <[email protected]>
Date:   Wed Jul 5 15:58:33 2023 +0200

    Merge pull request matrix-org#1801 from matrix-org/alfogrillo/fix_location_parser

    Fix fallback parsing logic for legacy location events

commit 191ae5a
Author: Alfonso Grillo <[email protected]>
Date:   Mon Jul 3 14:37:39 2023 +0200

    Add changelog.d file

commit 1accb66
Author: Alfonso Grillo <[email protected]>
Date:   Mon Jul 3 14:28:54 2023 +0200

    Fix fallback parsing of a location

commit 5f35db6
Author: Doug <[email protected]>
Date:   Wed Jun 21 11:32:29 2023 +0100

    Prepare for new sprint

commit 3f07af5
Merge: 67f6539 94d8e25
Author: Doug <[email protected]>
Date:   Wed Jun 21 11:32:27 2023 +0100

    Merge branch 'master' into develop

commit 94d8e25
Merge: b18527d 44cca11
Author: Doug <[email protected]>
Date:   Wed Jun 21 11:32:22 2023 +0100

    Merge branch 'release/0.26.12/master'

commit 44cca11
Author: Doug <[email protected]>
Date:   Wed Jun 21 11:32:22 2023 +0100

    finish version++

commit 156929e
Merge: b18527d 447e02f
Author: Doug <[email protected]>
Date:   Wed Jun 21 11:32:05 2023 +0100

    Merge pull request matrix-org#1800 from matrix-org/release/0.26.12/release

    Release 0.26.12

commit 447e02f
Author: Doug <[email protected]>
Date:   Wed Jun 21 10:16:15 2023 +0100

    version++

commit 67f6539
Merge: 822095f 800ba88
Author: Doug <[email protected]>
Date:   Wed Jun 21 10:06:42 2023 +0100

    Merge pull request matrix-org#1799 from matrix-org/johannes/bail-on-unknown-condition-types

    Ignore push rules with unknown condition kinds

commit 800ba88
Author: Johannes Marbach <[email protected]>
Date:   Wed Jun 21 09:28:35 2023 +0200

    Ignore push rules with unknown condition kinds

    Fixes: element-hq/element-ios#7601

commit 822095f
Author: Mauro Romito <[email protected]>
Date:   Tue Jun 13 13:11:56 2023 +0200

    Prepare for new sprint

commit b932090
Merge: 43cf8b3 b18527d
Author: Mauro Romito <[email protected]>
Date:   Tue Jun 13 13:11:54 2023 +0200

    Merge branch 'master' into develop

commit b18527d
Merge: 417ebda 55b90c9
Author: Mauro Romito <[email protected]>
Date:   Tue Jun 13 13:11:49 2023 +0200

    Merge branch 'release/0.26.11/master'

commit 55b90c9
Author: Mauro Romito <[email protected]>
Date:   Tue Jun 13 13:11:49 2023 +0200

    finish version++

commit e003a30
Merge: 417ebda e3ec1eb
Author: Mauro <[email protected]>
Date:   Tue Jun 13 13:11:09 2023 +0200

    Merge pull request matrix-org#1798 from matrix-org/release/0.26.11/release

    Release 0.26.11

commit e3ec1eb
Author: Mauro Romito <[email protected]>
Date:   Tue Jun 13 11:59:45 2023 +0200

    version++

commit 43cf8b3
Merge: fdfc031 561e5b2
Author: Nicolas Mauri <[email protected]>
Date:   Wed Jun 7 10:43:39 2023 +0200

    Merge pull request matrix-org#1794 from matrix-org/nimau/7576_msc3987_push_actions_cleanup

commit 561e5b2
Author: Nicolas Mauri <[email protected]>
Date:   Tue Jun 6 09:24:40 2023 +0200

    Implement MSC3987: Push actions clean-up

commit fdfc031
Merge: 04aa5bc af28779
Author: Nicolas Mauri <[email protected]>
Date:   Mon Jun 5 16:18:30 2023 +0200

    Merge pull request matrix-org#1793 from matrix-org/nimau/msc3912_with_rel_types

commit af28779
Author: Nicolas Mauri <[email protected]>
Date:   Fri Jun 2 09:02:35 2023 +0200

    MSC3912 implementation: stable property with_relations has been renamed with_rel_types

commit 04aa5bc
Merge: 258bdb8 d99e82f
Author: Mauro <[email protected]>
Date:   Tue May 30 17:38:28 2023 +0200

    Merge pull request matrix-org#1790 from matrix-org/mauroromito/jitsi_sdk_update

    JItsi SDK update

commit d99e82f
Author: Mauro Romito <[email protected]>
Date:   Tue May 30 16:32:38 2023 +0200

    changelog

commit 0745747
Author: Mauro Romito <[email protected]>
Date:   Tue May 30 16:22:13 2023 +0200

    updated the podspec

commit 258bdb8
Merge: ddb0682 3287d5c
Author: David Langley <[email protected]>
Date:   Fri May 19 13:56:27 2023 +0100

    Merge pull request matrix-org#1784 from matrix-org/langleyd/7551_fix_threads_empty_state

    Fix threads empty state: Allow empty array for chunk in MXAggregationPaginatedResponse

commit 3287d5c
Author: David Langley <[email protected]>
Date:   Thu May 18 16:46:18 2023 +0100

    this probably makes more sense

commit e1c9e5a
Author: David Langley <[email protected]>
Date:   Thu May 18 16:36:06 2023 +0100

    allow empty array for chunk in MXAggregationPaginatedResponse

commit 77b78e8
Author: David Langley <[email protected]>
Date:   Thu May 18 16:32:26 2023 +0100

    allow empty array for chunk in MXAggregationPaginatedResponse

commit ddb0682
Author: Element CI <[email protected]>
Date:   Tue May 16 14:06:36 2023 +0300

    Prepare for new sprint

commit 441001e
Merge: 3b76982 417ebda
Author: Element CI <[email protected]>
Date:   Tue May 16 14:06:34 2023 +0300

    Merge branch 'master' into develop

commit 417ebda
Merge: 9f1b4ba d389fec
Author: Element CI <[email protected]>
Date:   Tue May 16 14:06:29 2023 +0300

    Merge branch 'release/0.26.10/master'

commit d389fec
Author: Element CI <[email protected]>
Date:   Tue May 16 14:06:29 2023 +0300

    finish version++

commit acbc3e2
Merge: 9f1b4ba 226ab23
Author: Stefan Ceriu <[email protected]>
Date:   Tue May 16 14:05:15 2023 +0300

    Merge pull request matrix-org#1779 from matrix-org/release/0.26.10/release

    Release 0.26.10

commit 226ab23
Author: Element CI <[email protected]>
Date:   Tue May 16 14:02:45 2023 +0300

    version++

commit 3b76982
Merge: da17ebf fb064c4
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 27 17:37:04 2023 +0200

    Merge pull request matrix-org#1776 from matrix-org/nimau/7497_timeline_closed_polls

    Fix: Refreshing the poll when receiving pollEnd can break the chronological order in the store.

commit fb064c4
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 27 15:52:41 2023 +0200

    Fix: UnitTests

commit da17ebf
Merge: 98e7c1c fc76004
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 27 15:41:07 2023 +0200

    Merge pull request matrix-org#1777 from bwi-de/update-breadcrumb-list-when-leaving-room

    Update breadcrumb list when leaving room

commit 45ca433
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 27 15:22:51 2023 +0200

    Fix: compilation issue

commit 99227c7
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 27 15:01:27 2023 +0200

    Fix: PollAggregator - code refactoring

commit fc76004
Merge: c6903ec d1754dd
Author: JanNiklas Grabowski <[email protected]>
Date:   Thu Apr 27 12:36:30 2023 +0200

    Merge branch 'update-breadcrumb-list-when-leaving-room' into update_breadcrumb_list_when_leaving_room

    * update-breadcrumb-list-when-leaving-room:
      Rename 1777.bug to 1777.bugfix

commit c6903ec
Author: JanNiklas Grabowski <[email protected]>
Date:   Thu Apr 27 09:12:16 2023 +0000

    formatting

commit e1eb69c
Author: JanNiklas Grabowski <[email protected]>
Date:   Thu Apr 27 10:48:52 2023 +0200

    update account data only when necessary

commit a0f2cf9
Author: Nicolas Mauri <[email protected]>
Date:   Wed Apr 26 17:46:24 2023 +0200

    PollAggregator: poll is now optional

commit af3059b
Author: Nicolas Mauri <[email protected]>
Date:   Fri Apr 21 18:35:32 2023 +0200

    Fix: PollAggregator will now try to fetch pollStartEvent if it is missing from the store

commit d1754dd
Author: Jan Niklas Grabowski <[email protected]>
Date:   Fri Apr 21 16:25:58 2023 +0200

    Rename 1777.bug to 1777.bugfix

commit 01abe16
Author: JanNiklas Grabowski <[email protected]>
Date:   Fri Apr 21 16:22:36 2023 +0200

    add changelog

commit fb464aa
Author: Nicolas Mauri <[email protected]>
Date:   Thu Apr 20 10:58:16 2023 +0200

    Fix: Refreshing the poll when receiving pollEnd can break the chronological order in the store.

commit 98e7c1c
Merge: d72008e db75814
Author: Anderas <[email protected]>
Date:   Wed Apr 19 14:14:14 2023 +0100

    Merge pull request matrix-org#1770 from matrix-org/andy/crypto_sdk

    Enable Crypto SDK by default

commit db75814
Merge: edc99aa 485490e
Author: Anderas <[email protected]>
Date:   Wed Apr 19 14:13:59 2023 +0100

    Merge pull request matrix-org#1772 from matrix-org/andy/deprecate_crypto

    Deprecate MXLegacyCrypto

commit 485490e
Author: Andy Uhnak <[email protected]>
Date:   Wed Apr 19 14:13:27 2023 +0100

    One more legacy crypto use

commit c9005c9
Author: JanNiklas Grabowski <[email protected]>
Date:   Wed Apr 19 15:05:36 2023 +0200

    add success and failure callbacks

commit cfaf594
Author: JanNiklas Grabowski <[email protected]>
Date:   Wed Apr 19 12:59:14 2023 +0200

    refactoring

commit 9fec550
Author: JanNiklas Grabowski <[email protected]>
Date:   Wed Apr 19 12:48:53 2023 +0200

    update breadcrumb list when leaving a room

commit d72008e
Author: Doug <[email protected]>
Date:   Tue Apr 18 17:25:47 2023 +0100

    Prepare for new sprint

commit e13d4b0
Merge: 68bbc3e 9f1b4ba
Author: Doug <[email protected]>
Date:   Tue Apr 18 17:25:45 2023 +0100

    Merge branch 'master' into develop

commit 0b9001f
Author: Andy Uhnak <[email protected]>
Date:   Tue Apr 18 11:42:35 2023 +0100

    Add crypto migration delegate

commit 3c614a8
Author: Andy Uhnak <[email protected]>
Date:   Mon Apr 17 16:43:12 2023 +0100

    Deprecate MXLegacyCrypto

commit edc99aa
Author: Andy Uhnak <[email protected]>
Date:   Fri Apr 14 15:53:11 2023 +0100

    Enable Crypto SDK by default
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanceriu stefanceriu stefanceriu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@BillCarsonFr @stefanceriu