Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Transfer alias mappings when joining an upgraded room #6946

Merged
merged 8 commits into from
Mar 30, 2020
Merged

Transfer alias mappings when joining an upgraded room #6946

merged 8 commits into from
Mar 30, 2020

Commits on Feb 18, 2020

  1. Transfer alias mappings when joining an upgraded room

    @anoadragon453
    anoadragon453 committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    4d09f64 View commit details
    Browse the repository at this point in the history

  2. Add changelog

    @anoadragon453
    anoadragon453 committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    5fd9b24 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Merge branch 'develop' of github.com:matrix-org/synapse into anoa/upd… 

    …ate_remote_aliases_on_room_upgrade

* 'develop' of github.com:matrix-org/synapse: (166 commits)
  Clean up some LoggingContext stuff (#7120)
  Fix CAS redirect url (#6634)
  Newsfile
  Fix starting workers when federation sending not split out.
  Use the proper error code when a canonical alias that does not exist is used. (#7109)
  Update pre-built package name for FreeBSD (#7107). (#7107)
  Convert `*StreamRow` classes to inner classes (#7116)
  matrix.org was fine
  Update CHANGES.md
  changelog typos
  1.12.0 changelog
  1.12.0
  Fix processing of `groups` stream, and use symbolic names for streams (#7117)
  Set Referrer-Policy to no-referrer for media (#7009)
  Clean-up some auth/login REST code (#7115)
  Improve database configuration docs (#6988)
  Remove concept of a non-limited stream. (#7011)
  Convert some of the media REST code to async/await (#7110)
  Fix a bug in the federation API which could cause occasional "Failed to get PDU" errors (#7089).
  more changelog
  ...
    @anoadragon453
    anoadragon453 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    bd52c52 View commit details
    Browse the repository at this point in the history

  2. Add missing yield

    @anoadragon453
    anoadragon453 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    277bc3b View commit details
    Browse the repository at this point in the history

  3. Add typing to new method

    @anoadragon453
    anoadragon453 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    1fedf87 View commit details
    Browse the repository at this point in the history

  4. lint

    @anoadragon453
    anoadragon453 committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    7d12188 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Apply suggestions from code review 

    Co-Authored-By: Richard van der Hoff <[email protected]>
    @anoadragon453 @richvdh
    anoadragon453 and richvdh authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    08ee8c8 View commit details
    Browse the repository at this point in the history

  2. lint

    @anoadragon453
    anoadragon453 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    50d45f1 View commit details
    Browse the repository at this point in the history