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

MSC1849: Proposal for m.relates_to aggregations #1849

Closed
wants to merge 49 commits into from
Closed

MSC1849: Proposal for m.relates_to aggregations #1849

wants to merge 49 commits into from

Commits on Feb 4, 2019

  1. a very WIP draft of an aggregations MSC to replace #441

    @ara4n
    ara4n committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    0b5dab5 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. incorporate notes from sync with erik

    @ara4n
    ara4n committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    e03457d View commit details
    Browse the repository at this point in the history

  2. shower thoughts

    @ara4n
    ara4n committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    8567149 View commit details
    Browse the repository at this point in the history

  3. more notes from today's sync with erik

    @ara4n
    ara4n committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    ed2a3a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. Update with new proposal

    @erikjohnston
    erikjohnston committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    07050a4 View commit details
    Browse the repository at this point in the history

  2. fixup

    @erikjohnston
    erikjohnston committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    25b879b View commit details
    Browse the repository at this point in the history

  3. Add some notes about extended annotations

    @erikjohnston
    erikjohnston committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    f50de1f View commit details
    Browse the repository at this point in the history

  4. further updates from RLing with Erik

    @ara4n
    ara4n committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    ebb25e0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:matrix-org/matrix-doc into matthew/… 

    …msc1849
    @erikjohnston
    erikjohnston committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    7db56e1 View commit details
    Browse the repository at this point in the history

  6. Fix spacing

    @erikjohnston
    erikjohnston committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    a9d2efa View commit details
    Browse the repository at this point in the history

Commits on May 1, 2019

  1. Add proposed pagination API

    @erikjohnston
    erikjohnston committed May 1, 2019
    Configuration menu
    Copy the full SHA
    c47391e View commit details
    Browse the repository at this point in the history

  2. Flesh out the pagination API a bit

    @erikjohnston
    erikjohnston committed May 1, 2019
    Configuration menu
    Copy the full SHA
    1b24334 View commit details
    Browse the repository at this point in the history

  3. following RL review

    @ara4n
    ara4n committed May 1, 2019
    Configuration menu
    Copy the full SHA
    a12db5b View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Add edit example

    @erikjohnston
    erikjohnston committed May 2, 2019
    Configuration menu
    Copy the full SHA
    3255ae0 View commit details
    Browse the repository at this point in the history

  2. Example has been added

    @erikjohnston
    erikjohnston committed May 2, 2019
    Configuration menu
    Copy the full SHA
    e0f165e View commit details
    Browse the repository at this point in the history

Commits on May 12, 2019

  1. try to converge towards a proper reviewable draft

    @ara4n
    ara4n committed May 12, 2019
    Configuration menu
    Copy the full SHA
    d38d7a7 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. yet more notes on yet more edge cases

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    08de484 View commit details
    Browse the repository at this point in the history

  2. Add a coherent overview; remove a bunch of FIXMEs

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e78e7ad View commit details
    Browse the repository at this point in the history

  3. Add TOC

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    dacae1f View commit details
    Browse the repository at this point in the history

  4. markdown tweaks

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    5375a23 View commit details
    Browse the repository at this point in the history

  5. typos

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    0f7cf5e View commit details
    Browse the repository at this point in the history

  6. s/contents/content/g

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    4bb8d6b View commit details
    Browse the repository at this point in the history

  7. fix wording

    @ara4n
    ara4n committed May 13, 2019
    Configuration menu
    Copy the full SHA
    60a3d61 View commit details
    Browse the repository at this point in the history

  8. Update proposals/1849-aggregations.md 

    Co-Authored-By: Travis Ralston <[email protected]>
    @ara4n @turt2live
    ara4n and turt2live committed May 13, 2019
    Configuration menu
    Copy the full SHA
    117ae97 View commit details
    Browse the repository at this point in the history

  9. Update proposals/1849-aggregations.md 

    Co-Authored-By: Travis Ralston <[email protected]>
    @ara4n @turt2live
    ara4n and turt2live committed May 13, 2019
    Configuration menu
    Copy the full SHA
    8627fb7 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. add m.new_content

    @ara4n
    ara4n committed May 14, 2019
    Configuration menu
    Copy the full SHA
    2dde2c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Merge branch 'master' into matthew/msc1849

    @ara4n
    ara4n committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    b166d6c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. WIP commit of rewrite to MSC1849

    @ara4n
    ara4n committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    adb240d View commit details
    Browse the repository at this point in the history

  2. WIP commit of rewrite to MSC1849

    @ara4n
    ara4n committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    a6c8b65 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. write up the new gappy sync stuff

    @ara4n
    ara4n committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    081ea3d View commit details
    Browse the repository at this point in the history

  2. s/stale_relations/stale_events/

    @ara4n
    ara4n committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    9c90cc1 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. rewrite the paginations section

    @ara4n
    ara4n committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    3f3d60e View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. finish rewriting MSC1849, in theory, incorporating all review so far

    @ara4n
    ara4n committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    d98d5b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2154 from matrix-org/matthew/msc1849-rewrite 

    Matthew/msc1849 rewrite
    @ara4n
    ara4n committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    c313489 View commit details
    Browse the repository at this point in the history

  3. fix typos

    @ara4n
    ara4n committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    fa7c338 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2019

  1. Update proposals/1849-aggregations.md 

    Co-Authored-By: Travis Ralston <[email protected]>
    @ara4n @turt2live
    ara4n and turt2live committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    1409119 View commit details
    Browse the repository at this point in the history

  2. Update proposals/1849-aggregations.md 

    Co-Authored-By: Travis Ralston <[email protected]>
    @ara4n @turt2live
    ara4n and turt2live committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    e8fde9d View commit details
    Browse the repository at this point in the history

  3. incorporate some of the PR review

    @ara4n
    ara4n committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    4d236c6 View commit details
    Browse the repository at this point in the history

  4. remaining review

    @ara4n
    ara4n committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    f63b20a View commit details
    Browse the repository at this point in the history

  5. clarify m.replace bundle structure

    @ara4n
    ara4n committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    b228688 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. wording tweaks

    @ara4n
    ara4n committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    fb4446f View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-Authored-By: J. Ryan Stinnett <[email protected]>
    @ara4n @jryans
    ara4n and jryans committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    6225aae View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. PR review

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    6751de6 View commit details
    Browse the repository at this point in the history

  2. clarify ignored users

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    eab778d View commit details
    Browse the repository at this point in the history

  3. incorporate erik feedback

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    a63d27e View commit details
    Browse the repository at this point in the history

  4. POST /event

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    4e8d370 View commit details
    Browse the repository at this point in the history

  5. clarify errors on /aggregations

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    e816233 View commit details
    Browse the repository at this point in the history

  6. add bruno's local echo considerations

    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    4a96865 View commit details
    Browse the repository at this point in the history

  7. arbitrarily restrict trailing slashes for now 

    #1849 (comment)
    @ara4n
    ara4n committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    e57033a View commit details
    Browse the repository at this point in the history