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 wrong handling of encrypted rooms when loading them from sync accumulator #3640

Merged
merged 5 commits into from
Aug 2, 2023
Merged

Fix wrong handling of encrypted rooms when loading them from sync accumulator #3640

merged 5 commits into from
Aug 2, 2023

Commits on Jul 31, 2023

  1. Revert "Ensure we don't overinflate the total notification count (#3634… 

    …)"

This reverts commit fd0c4a7.
    @t3chguy
    t3chguy committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    aa0ebb0 View commit details
    Browse the repository at this point in the history

  2. Fix wrong handling of encrypted rooms when loading them from sync acc… 

    …umulator
    @t3chguy
    t3chguy committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4360182 View commit details
    Browse the repository at this point in the history

  3. Tidy up code, removing sections which didn't make any difference

    @t3chguy
    t3chguy committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    1e96484 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3… 

    …chguy/fix/25803

# Conflicts:
#	src/client.ts
    @t3chguy
    t3chguy committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9464289 View commit details
    Browse the repository at this point in the history

  5. Add test

    @t3chguy
    t3chguy committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4169ccb View commit details
    Browse the repository at this point in the history