matrix-org/matrix-spec-proposals

Pull Requests Commits

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

erikjohnston committed 10 years ago

3b4c3522

Merge branch 'release-0.2.0'

kegsay committed 10 years ago

db660d70

Go into a bit more detail about feature profiles

kegsay committed 10 years ago

28fd1aa2

Merge branch 'master' into release-0.2.0

kegsay committed 10 years ago

2fbf851a

Merge pull request #74 from matrix-org/module-presence

kegsay committed 10 years ago

8c092e3d

Remove duplicate sentences from merge conflicts

kegsay committed 10 years ago

417c5b53

kegsay committed 10 years ago

c8ddf1af

Merge pull request #78 from matrix-org/module-typing2

kegsay committed 10 years ago

ead79614

Merge pull request #81 from matrix-org/daniel/speculatormerge

illicitonion committed 10 years ago

7df3d909

illicitonion committed 10 years ago

0e8f1b54

Merge pull request #83 from matrix-org/module-content-repo

kegsay committed 10 years ago

68df9940

Merge pull request #82 from matrix-org/daniel/reportport

kegsay committed 10 years ago

f38473ef

Merge pull request #63 from matrix-org/erikj/room_create_preset

erikjohnston committed 10 years ago

ccdd376f

Merge branch 'master' into module-content-repo

kegsay committed 10 years ago

09ac3678

Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type

kegsay committed 10 years ago

4dabcd11

Be more explicit about keys that are clobbered

erikjohnston committed 10 years ago

912a8ca7

s/private_chat_shared_power/trusted_private_chat/

erikjohnston committed 10 years ago

dbc72c43

Bump to swagger-parser 3.2.1 - remove x- keys on headers

kegsay committed 10 years ago

3d9dbe42

speculator: Report listening port

illicitonion committed 10 years ago

a69e03f5

speculator: Merge after fetching, so that /spec/head works

illicitonion committed 10 years ago

30232f20

Do not try to parse non-json request examples as json

kegsay committed 10 years ago

8c4d7f50

Flesh out content repo; modify templating to support headers

kegsay committed 10 years ago

87b6dd84

Merge pull request #80 from matrix-org/module-receipts

kegsay committed 10 years ago

8aad238c

Merge pull request #79 from matrix-org/module-voip

kegsay committed 10 years ago

8b958f4e

This isn't javascript. s/,/%/

kegsay committed 10 years ago

560cd7a5

Merge branch 'master' into module-voip

kegsay committed 10 years ago

da2be7ea

Merge branch 'master' into module-typing2

kegsay committed 10 years ago

1520f364

Merge branch 'master' into module-presence

kegsay committed 10 years ago

cc6f256b

Merge branch 'master' into module-receipts

kegsay committed 10 years ago

60008872

Flesh out receipts module. Add receipts swagger

kegsay committed 10 years ago

c972dad8

Older