matrix-org/matrix-spec-proposals

Pull Requests Commits

Remove duplicate sentences from merge conflicts

kegsay committed 10 years ago

417c5b53

Merge branch 'master' into module-presence

kegsay committed 10 years ago

cc6f256b

Merge pull request #65 from matrix-org/spec-feature-profiles

kegsay committed 10 years ago

4a7a682c

Merge pull request #64 from matrix-org/erikj/invite_state

erikjohnston committed 10 years ago

abe5d08a

Rename to 'Managing history visibility'

kegsay committed 10 years ago

d092b228

Explain what 'embedded' clients are

kegsay committed 10 years ago

91b6347f

Move feature profiles section to modules as a sub-section

kegsay committed 10 years ago

be9402b6

Table tweaks from PR

kegsay committed 10 years ago

0320e8ce

Make explicit the state event only includes some keys

erikjohnston committed 10 years ago

9964dd14

Merge pull request #76 from matrix-org/speculator-speedup

kegsay committed 10 years ago

f74cb4d5

Merge pull request #75 from matrix-org/continuserv-speedup

kegsay committed 10 years ago

e5fecbb8

Speed up continuserv

kegsay committed 10 years ago

b6f0b67d

Modify how speculator uses git repos

kegsay committed 10 years ago

ede43fbe

Merge branch 'master' into module-presence

kegsay committed 10 years ago

52f6496c

Merge pull request #73 from matrix-org/paragraphs

kegsay committed 10 years ago

4aad6976

Delete rather than comment out the offending CSS

kegsay committed 10 years ago

a49d5f67

Fix paragraph CSS and adjust where paragraphs are in the RST

kegsay committed 10 years ago

4e1e82f9

Move presence specific sections from intro to presence module

kegsay committed 10 years ago

069e4e39

Start converting the presence module. Add Rationale admonition.

kegsay committed 10 years ago

0a04672d

Add room history visibility as a module.

kegsay committed 10 years ago

cdf9f011

Make E2E optional

kegsay committed 10 years ago

82c27884

Merge pull request #69 from matrix-org/erikj/login_token

kegsay committed 10 years ago

c96f02c2

Merge pull request #70 from matrix-org/spec-module-format

kegsay committed 10 years ago

beafc74f

Merge pull request #72 from matrix-org/daniel/generateathead

illicitonion committed 10 years ago

eec021ee

Support viewing the spec at head

illicitonion committed 10 years ago

083a7609

erikjohnston committed 10 years ago

50e1b4c3

Mandate macaroon

erikjohnston committed 10 years ago

6e6bc8a5

Add txn_id rationale

erikjohnston committed 10 years ago

ce53a171

kegsay committed 10 years ago

5abea1f2

Clarify template suffixes

kegsay committed 10 years ago

70518ae6

Older