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

5313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kegan Dougal 3608f3a282 SPEC-144 : Use https examples not http. 2015-10-14 14:44:09 +01:00
Richard van der Hoff 013b6db895 Add a note on building the speculator 
... because the wiki says you need to read the README on how to build it.
 2015-10-14 14:42:52 +01:00
Erik Johnston a7a5cb088b Add titles 2015-10-14 14:35:08 +01:00
Richard van der Hoff f02c33738f Merge pull request #97 from matrix-org/rav/speculator 
Add richvdh to list of trusted pushers for spectulator
 2015-10-14 14:34:05 +01:00
Richard van der Hoff 270e1d7aa8 Add richvdh to list of trusted pushers for spectulator 
richvdh is awesome, he should have all the permissions.
 2015-10-14 14:29:36 +01:00
Erik Johnston e42c8b5b63 Add search API 2015-10-14 14:19:11 +01:00
Richard van der Hoff 4a9db39277 Clean up some untruths in the login api doc 
add "type", and "username" -> "user"
 2015-10-14 13:38:28 +01:00
Kegan Dougal 34bd8edec5 Move related auth sections together 2015-10-14 13:26:58 +01:00
Kegan Dougal 6f6861a11d Swaggerify the createRoom API 2015-10-14 13:17:51 +01:00
Kegan Dougal 41fb0645a9 Add message pagination API 2015-10-14 11:16:58 +01:00
Kegan Dougal 07d7a3fa3a Shuffle pagination section around 2015-10-14 11:03:53 +01:00
Kegan Dougal 7bdb71b1c9 Tweak the syncing section 
Bring together disparate sections to make it more cohesive.
 2015-10-14 10:25:39 +01:00
Kegan Dougal e716e81963 Add dir parameter to pagination. Remove path references 
This section needs a lot of work to not lie.
 2015-10-14 09:58:03 +01:00
Kegan Dougal e561a663d3 Tweaks to intro, start using swagger APIs in the CS API section. 2015-10-13 16:53:27 +01:00
Kegsay ee3fe989ca Linkify 2015-10-13 15:47:56 +01:00
Kegan Dougal 87f656ee0a Merge branch 'human-id-rules' of github.com:matrix-org/matrix-doc into human-id-rules 2015-10-13 15:19:27 +01:00
Kegan Dougal c9f6534d84 Merge branch 'master' into human-id-rules 2015-10-13 15:16:41 +01:00
Kegsay 0ab2d66ae2 Make it valid RST 2015-10-13 15:11:17 +01:00
Kegan Dougal 3d5ec5eb15 Updated to reflect more recent progress 2015-10-13 15:09:00 +01:00
Kegan Dougal 4170dbd5cf Review comments 2015-10-13 11:29:54 +01:00
Kegan Dougal 173d00cea0 Review comments 2015-10-13 11:08:19 +01:00
Oddvar Lovaas 1cfe4f784f special css for spec/howto 2015-10-12 19:57:41 +01:00
Oddvar Lovaas ceebf34fca generate docs with new nav bar 2015-10-12 19:11:35 +01:00
Daniel Wagner-Hall 98f225a974 Merge pull request #90 from matrix-org/daniel/speculator 
Checkout SHA of origin/master rather than merging
 2015-10-12 18:19:55 +01:00
Daniel Wagner-Hall c48abd93b9 Merge pull request #41 from matrix-org/daniel/threepidinvites-2 
Specify third party room invites
 2015-10-12 18:11:52 +01:00
Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 
Conflicts:
	specification/targets.yaml
 2015-10-12 18:11:01 +01:00
Daniel Wagner-Hall 4a1fb74897 Review comments 2015-10-12 18:08:51 +01:00
Kegsay 616f3990aa Merge pull request #87 from matrix-org/module-push 
Push Module
 2015-10-12 17:51:44 +01:00
Kegan Dougal 8f5c796884 Linkify 'pushers' 2015-10-12 17:50:46 +01:00
Oddvar Lovaas 89426c9322 typos and fixes 2015-10-09 17:43:46 +01:00
Kegan Dougal e378de8379 Shuffle history visibility module to be in the module format 2015-10-09 11:04:11 +01:00
Daniel Wagner-Hall 6922850643 Add missing return 2015-10-09 11:02:27 +01:00
Daniel Wagner-Hall b46f0e30b8 Checkout SHA of origin/master rather than merging 2015-10-09 11:02:00 +01:00
Daniel Wagner-Hall 481298db83 Revert "Checkout SHA of origin/master rather than merging" 
This reverts commit 0dbc6d8277.
 2015-10-09 11:01:35 +01:00
Daniel Wagner-Hall 0dbc6d8277 Checkout SHA of origin/master rather than merging 2015-10-09 10:59:26 +01:00
Daniel Wagner-Hall b7e98a263a Merge pull request #89 from matrix-org/daniel/speculator 
speculator: Specify merge target
 2015-10-09 10:48:24 +01:00
Daniel Wagner-Hall a0cf485919 speculator: Specify merge target 2015-10-09 10:43:27 +01:00
Mark Haines d6bdde4cee Merge pull request #88 from matrix-org/markjh/initial_sync_archived_flag 
Add flag to initial sync to say we want rooms that the user has left
 2015-10-09 10:28:40 +01:00
Oddvar Lovaas 51ab51ae26 Only documents in matrix-doc! 2015-10-08 19:27:08 +01:00
Mark Haines d42c3195e6 Use 'true' rather than '1' for archived flag 2015-10-08 18:06:52 +01:00
Mark Haines 241096dc81 Add a flag to initial sync to indicate we want rooms that the user has left 2015-10-08 17:25:38 +01:00
Kegan Dougal 213cb25290 Wrap correctly 2015-10-08 16:38:41 +01:00
Kegan Dougal f2a6950cc3 Minor tweaks; allow objects without props/parents if a title is set 
This allows us to do things like {Tweaks} where Tweaks is defined somewhere
else.
 2015-10-08 16:21:26 +01:00
Daniel Wagner-Hall dc3c02aff5 Review comments 2015-10-08 10:08:38 -05:00
Daniel Wagner-Hall 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05:00
Kegan Dougal 9c95ee5c1f Modify wording and formatting 2015-10-08 15:36:03 +01:00
Kegan Dougal befa23624e It's dangerous to go alone, take this. 2015-10-08 13:41:47 +01:00
Kegan Dougal 65504db7bb Display nested keys on arrays of objects. Make it valid swagger. 2015-10-08 13:40:21 +01:00
Kegan Dougal 31ae4b3859 Swaggerify push notification API 
Edit units.py to support nested JSON request keys
 2015-10-08 13:08:21 +01:00
Kegan Dougal a9618a981b Swaggerify the /enabled endpoint 2015-10-08 11:16:42 +01:00