matrix-org/matrix-spec-proposals

Pull Requests Commits

Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls

erikjohnston committed 7 years ago

8e6c8ba5

Actually use proper sentences like a proper adult

erikjohnston committed 7 years ago

a1aedb38

Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules

erikjohnston committed 7 years ago

Verified 0adfd1eb

erikjohnston committed 7 years ago

d63184eb

erikjohnston committed 7 years ago

3c53e191

Reindent as RST requires sublists to be three spaces

erikjohnston committed 7 years ago

59f86ec8

Require creator field

erikjohnston committed 7 years ago

f4706c88

Be consistent with 'If..., reject'

erikjohnston committed 7 years ago

f3aea32a

erikjohnston committed 7 years ago

6c8a45c1

Merge pull request #1589 from turt2live/travis/c2s/inhibit-login

turt2live committed 7 years ago

Verified 7f719b23

Merge pull request #1441 from matrix-org/erikj/state_res_msc

turt2live committed 7 years ago

Verified 2f55dd66

Merge pull request #1567 from turt2live/travis/c2s/3pid-binding

turt2live committed 7 years ago

Verified ce14779a

Wording change ('may not' has a special meaning)

turt2live committed 7 years ago

5da3072e

Merge pull request #1576 from turt2live/travis/s2s/key-mgmt

turt2live committed 7 years ago

Verified 4b7f308f

device_keys are required

turt2live committed 7 years ago

2a08a308

Fix links to client-server spec

turt2live committed 7 years ago

caaa688e

Merge remote matrix-org/master

turt2live committed 7 years ago

219b27b1

Merge pull request #1622 from matrix-org/rav/clarify_event_signing

richvdh committed 7 years ago

Verified 492df880

Merge branch 'master' into rav/clarify_event_signing

richvdh committed 7 years ago

Verified 0f84c698

/3pid/delete returns an empty object

turt2live committed 7 years ago

8bcd7d26

Remove mentions of identity services from /3pid/delete

turt2live committed 7 years ago

390f1c16

Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding

turt2live committed 7 years ago

86c85aea

Merge pull request #1557 from turt2live/travis/general/r0-prep

turt2live committed 7 years ago

Verified cee0a5ac

Merge pull request #1558 from turt2live/travis/c2s/fix-events

turt2live committed 7 years ago

Verified 951b4429

Add an `age` to the invite room state example

turt2live committed 7 years ago

429f3027

Fix server-server link in IS spec

turt2live committed 7 years ago

32cde24b

Merge pull request #1615 from turt2live/travis/is/touchups

turt2live committed 7 years ago

Verified e82c22b0

Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt

turt2live committed 7 years ago

f09db160

Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep

turt2live committed 7 years ago

2753d243

Correctly check for the 'core' folder

turt2live committed 7 years ago

464f4f5f

Older