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.

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

Merge changes from develop #2563

Merged
merged 15 commits into from
Aug 4, 2022

Commits on Jul 26, 2022

  1. Configuration menu
    Copy the full SHA
    300d8b0 View commit details
    Browse the repository at this point in the history
  2. v19.2.0-rc.1

    RiotRobot committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    a7fd7fd View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Configuration menu
    Copy the full SHA
    4427201 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa6708c View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Merge pull request #2555 from matrix-org/kegan/sync-v3

    Sliding sync: add missing filters from latest MSC
    kegsay authored Aug 2, 2022
    Configuration menu
    Copy the full SHA
    f099134 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3873dd View commit details
    Browse the repository at this point in the history
  3. v19.2.0

    RiotRobot committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    aac0023 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fb0a0c6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cf33569 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Configuration menu
    Copy the full SHA
    b79f469 View commit details
    Browse the repository at this point in the history
  2. Retry to-device messages (#2549)

    * Retry to-device messages
    
    This adds a queueToDevice API alongside sendToDevice which is a
    much higher-level API that adds the messages to a queue, stored in
    persistent storage, and retries them periodically. Also converts
    sending of megolm keys to use the new API.
    
    Other uses of sendToDevice are nopt converted in this PR, but could
    be later.
    
    Requires matrix-org/matrix-mock-request#17
    
    * Bump matrix-mock-request
    
    * Add more waits to make indexeddb tests pass
    
    * Switch some test expectations to queueToDevice
    
    * Stop straight away if the client has been stopped
    
    Hopefully will fix tests being flakey and logging after tests have
    finished.
    
    * Add return types & fix constant usage
    
    * Fix return type
    
    Co-authored-by: Germain <germains@element.io>
    
    * Fix return type
    
    Co-authored-by: Germain <germains@element.io>
    
    * Fix return type
    
    Co-authored-by: Germain <germains@element.io>
    
    * Stop the client in all test cases
    
    Co-authored-by: Germain <germains@element.io>
    dbkr and Germain authored Aug 3, 2022
    Configuration menu
    Copy the full SHA
    7e784da View commit details
    Browse the repository at this point in the history
  3. Add support for sending user-defined encrypted to-device messages (#2528

    )
    
    * Add support for sending user-defined encrypted to-device messages
    
    This is a port of the same change from the robertlong/group-call branch.
    
    * Fix tests
    
    * Expose the method in MatrixClient
    
    * Fix a code smell
    
    * Fix types
    
    * Test the MatrixClient method
    
    * Fix some types in Crypto test suite
    
    * Test the Crypto method
    
    * Fix tests
    
    * Upgrade matrix-mock-request
    
    * Move useRealTimers to afterEach
    robintown authored Aug 3, 2022
    Configuration menu
    Copy the full SHA
    c36bfc8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d867aff View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Merge remote-tracking branch 'origin/develop' into robertlong/group-call

    Nontrivial merge: reintroduces the setNewStream method which was removed
    in #2551 (I think it makes
    sense as a convenient way to re-use the feed wrapper object but switch out
    the feed? Comment updated appropriately.)
    dbkr committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    d73c89d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e23e10 View commit details
    Browse the repository at this point in the history