Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-23 01:38:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2996 commits 30 branches 42 tags 32 MiB
Commit graph

2996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oddvar Lovaas 92f75ec23c image urls 2016-02-16 16:26:21 +00:00
Oddvar Lovaas b4dedb0b0d new featured clients and update images. moved angular one out. 2016-02-16 16:20:26 +00:00
Oddvar Lovaas ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc 2016-02-16 11:01:32 +00:00
Oddvar Lovaas b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 2016-02-16 11:01:04 +00:00
Mark Haines 8a050aebc0 Add a note to the docs for before and after to make it clear that they cannot be used with the predefined rules 2016-02-15 17:17:58 +00:00
Mark Haines 5d85e3a505 Remove indents 2016-02-15 16:53:08 +00:00
Mark Haines afe7638e30 Add a new title level to appease gendoc 2016-02-15 16:50:15 +00:00
Mark Haines b16af5ef64 Fix JSON, add headers 2016-02-15 16:41:47 +00:00
Mark Haines 8a1a02a11b Update the predefined push rules in the spec 2016-02-15 16:28:43 +00:00
Daniel Wagner-Hall 072d285153 speculator: Allow access token to be specified 2016-02-15 14:48:26 +00:00
Oddvar Lovaas 5d2eae58bd adding descriptions; moving things around 2016-02-12 16:38:19 +00:00
Oddvar Lovaas 6b4af54f42 remove the ubuntu entry for now 2016-02-12 15:58:52 +00:00
Oddvar Lovaas 1779f82410 remove for now 2016-02-12 15:56:06 +00:00
Oddvar Lovaas 02fc978241 README 2016-02-12 15:39:32 +00:00
Oddvar Lovaas 0e6a9af434 moving things around 2016-02-12 15:28:10 +00:00
Daniel Wagner-Hall ea170e5dca m.third_party_invite: Allow multiple public keys 2016-02-12 13:15:21 +00:00
Daniel Wagner-Hall 2890d282e3 Merge pull request #271 from matrix-org/daniel/asids 
Add ID to AS guide
 2016-02-12 11:42:56 +00:00
Daniel Wagner-Hall bf6bff3af6 Add ID to AS guide 2016-02-12 11:31:43 +00:00
Oddvar Lovaas 8c05e12cfc All the Matrix projects 2016-02-12 11:15:18 +00:00
Matthew Hodgson 6925547875 remove the oversimplification that the WebRTC standard is based around two-oparty communication 2016-02-11 18:34:28 +00:00
Matthew Hodgson 41130314da random incoherent thoughts on reputation that should live somewhere 2016-02-09 12:07:58 +00:00
David Baker 2e1c2c23e4 Merge pull request #269 from matrix-org/dbkr/profile_return_null 
Clarify what profile endpoints return if avatar url / display name isn't set
 2016-02-03 15:07:54 +00:00
David Baker 53a4a563e2 Actually we think they should not be present (which means synapse is buggy). 2016-02-03 14:54:29 +00:00
David Baker 542b17e944 Clarify what profile endpoints return if avatar url / display name isn't set 2016-02-03 13:14:12 +00:00
Oddvar Lovaas 630ce3d5c6 wrong link 2016-02-03 10:11:58 +00:00
Richard van der Hoff cb87da12f2 Merge pull request #268 from matrix-org/rav/add_event_to_context 
Add 'event' to event context API
 2016-02-01 18:56:45 +01:00
Richard van der Hoff 58b346e204 s/user_id/sender/ in context example response 2016-02-01 17:50:36 +00:00
Richard van der Hoff b2e0a855cc Add 'event' to event context API 
also link through to the event schemas
 2016-02-01 17:45:45 +00:00
Daniel Wagner-Hall 2ed95a9a40 Merge pull request #267 from matrix-org/daniel/3pid 
Specify login behaviour for unknown 3pids
 2016-01-29 16:58:10 +00:00
Daniel Wagner-Hall 0da26cd7e1 Specify login behaviour for unknown 3pids 2016-01-29 16:49:54 +00:00
Mark Haines f291484709 Merge pull request #265 from matrix-org/markjh/3pid_login 
Add 3pid password login to the spec
 2016-01-29 15:42:21 +01:00
Mark Haines 245e8e8571 Add 3pid password login to the spec 2016-01-29 14:42:18 +00:00
Mark Haines 72d859609a Merge pull request #266 from matrix-org/markjh/three_pid_creds 
Fix the key name to be three_pid_creds rather than threePidCreds
 2016-01-29 15:39:41 +01:00
Mark Haines e7f80b7c71 Fix the key name to be three_pid_creds rather than threePidCreds 2016-01-29 13:00:59 +00:00
Daniel Wagner-Hall 9d1fc97505 Merge pull request #264 from matrix-org/daniel/unban 
Require explicit un-banning
 2016-01-15 14:08:44 +00:00
Daniel Wagner-Hall 2e46b587b8 Require explicit un-banning 2016-01-15 14:08:40 +00:00
David Baker c69481d67a Merge pull request #263 from matrix-org/invalid_user_name 
Add an error code for invalid user names.
 2016-01-15 13:30:02 +00:00
David Baker 169cc98101 M_INVALID_USERNAME to be consistent with the name of the parameter 2016-01-15 10:04:29 +00:00
David Baker 2301a792d7 Add an error code for invalid user names. 2016-01-14 17:19:04 +00:00
Daniel Wagner-Hall bd348b6810 Merge pull request #262 from matrix-org/daniel/asid 
Add ID to application services
 2016-01-14 11:05:58 +00:00
Matthew Hodgson cfbb695fd3 typoe 2016-01-13 18:25:33 +00:00
Daniel Wagner-Hall 9bc07ea093 Add ID to application services 2016-01-13 16:04:01 +00:00
Daniel Wagner-Hall 5cf22c210e Merge pull request #261 from matrix-org/daniel/join 
/join and /room/:roomId/join aren't exact aliases

Separate them, clarify their differences.

Also, fix some links which weren't being properly populated.
 2016-01-13 15:55:54 +00:00
Daniel Wagner-Hall 1e2b63763e /join and /room/:roomId/join aren't exact aliases 
Separate them, clarify their differences.

Also, fix some links which weren't being properly populated.
 2016-01-13 15:55:51 +00:00
Richard van der Hoff 367e1334eb Merge pull request #260 from matrix-org/rav/start_0.0.2 
Start development on next spec version
 2016-01-11 16:01:23 +00:00
Richard van der Hoff 91fa78eb53 Start development on next spec version 2016-01-11 15:52:08 +00:00
Richard van der Hoff e6af0441e1 Final r0.0.1 changelog entries 2016-01-11 15:29:35 +00:00
Richard van der Hoff 00d10dd630 Merge pull request #257 from matrix-org/rav/body_params_in_tables 
Display POST body parameters as tables
 2016-01-11 15:24:04 +00:00
Richard van der Hoff 7a244ff977 Merge branch 'master' into rav/body_params_in_tables 
Conflicts:
	templating/matrix_templates/units.py
 2016-01-11 14:36:28 +00:00
Richard van der Hoff b8669609a0 Merge pull request #255 from matrix-org/rav/refactor_schema_logic 
Refactor a bunch of the logic in matrix_templates/units.py
 2016-01-11 14:27:04 +00:00