Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: matrix-org/complement
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: globekeeper/complement
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 6 files changed
  • 3 contributors

Commits on Aug 4, 2022

  1. Ignore two compliment test cases for dendrite

    @PiotrKozimor
    PiotrKozimor committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    fe1b601 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @PiotrKozimor
    PiotrKozimor committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    95e5623 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @PiotrKozimor
    PiotrKozimor committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    ad1e626 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @PiotrKozimor
    PiotrKozimor committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    56fe2af View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @PiotrKozimor
    PiotrKozimor committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    1ccd69b View commit details
    Browse the repository at this point in the history

  2. Fix a bad merge

    @PiotrKozimor
    PiotrKozimor committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    c3258c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2022

  1. Squashed commit of the following: 

    commit 26e6c52e2128ec9f985fdaf45c8e92ccf1bdbcbc
Author: Piotr Kozimor <p1996k@gmail.com>
Date:   Thu Oct 27 11:18:03 2022 +0200

    Adjust tests for forgotten content and timestamp fields

commit 087a5848e5befe48c28825c77f4ae5e3298b2a13
Author: Piotr Kozimor <p1996k@gmail.com>
Date:   Wed Oct 26 15:15:42 2022 +0200

    Multiroom tests
    @PiotrKozimor
    PiotrKozimor committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    7f1af0b View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Adjust data type for multiroom

    @PiotrKozimor
    PiotrKozimor committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    6146bef View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @PiotrKozimor
    PiotrKozimor committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    780a2bd View commit details
    Browse the repository at this point in the history

  2. Fix multiroom after merge

    @PiotrKozimor
    PiotrKozimor committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    b08894c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. ♻️ timestamp2origin_server_ts in /sync mr response

    @Danieloni1
    Danieloni1 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    d95bedf View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. 👔 Distinguish multiroom data from visibility

    @Danieloni1
    Danieloni1 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    3103885 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. 💚 Pass Dendrite tests.

    @Danieloni1
    Danieloni1 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    0b75fb2 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. Merge commit 'ad263aa5d0dfbd823d99e486642d71f402a07ffa' into upstream… 

    …-changes
    @Danieloni1
    Danieloni1 committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    90a3646 View commit details
    Browse the repository at this point in the history

  2. 💚 Only run against Dendrite homeserver.

    @Danieloni1
    Danieloni1 committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    dce1ef0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from globekeeper/upstream-changes 

    Upstream changes
    @Danieloni1
    Danieloni1 authored Dec 27, 2023
    Configuration menu
    Copy the full SHA
    c7203c0 View commit details
    Browse the repository at this point in the history
Loading