Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-02 22:18:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
842 commits 31 branches 42 tags 32 MiB
Commit graph

842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kegsay c5dc383668 Merge pull request #85 from matrix-org/module-im 
Instant messaging module
 2015-10-15 10:59:41 +01:00
Kegan Dougal f51ee70633 Review comments round 2 2015-10-15 10:19:51 +01:00
Kegsay e5559e4ea5 Merge pull request #106 from matrix-org/erikj/newline_gendoc_STOP_BEING_CRANKY 
gendoc should just add newlines rather than complaining about the lack thereof
 2015-10-15 09:56:04 +01:00
Kegsay 6a70828400 Merge pull request #95 from matrix-org/rav/login-api-fixes 
Clean up some untruths in the login api doc
 2015-10-15 09:55:31 +01:00
Kegsay 1229ad24dd Merge pull request #103 from matrix-org/spec-165-mxc-security 
SPEC-165: Outline directory traversal attacks on MXC URIs
 2015-10-14 17:48:59 +01:00
Kegsay bc0ab32cfd Merge pull request #99 from matrix-org/spec-144-https-examples 
SPEC-144 : Use https examples not http
 2015-10-14 17:46:29 +01:00
Kegsay dd5b41e99c Merge pull request #104 from matrix-org/spec-205-password-strength 
SPEC-205: Warn about password strengths in m.login.password section
 2015-10-14 17:45:42 +01:00
Erik Johnston 70704240dc gendoc should just add newlines rather than complaining about the lack thereof 2015-10-14 16:29:18 +01:00
Kegan Dougal f0d8052951 SPEC-205: Warn about password strengths in m.login.password section 2015-10-14 15:42:44 +01:00
Kegan Dougal 44b19a8b0e SPEC-165: Outline directory traversal attacks on MXC URIs 2015-10-14 15:27:56 +01:00
Richard van der Hoff a7332c8684 Merge pull request #98 from matrix-org/rav/speculator-readme 
Add a note on building the speculator
 2015-10-14 14:46:20 +01:00
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
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
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 4170dbd5cf Review comments 2015-10-13 11:29:54 +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
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
Kegan Dougal 56ce432399 Get profile tag keys displaying correctly. 2015-10-08 10:14:05 +01:00
Kegan Dougal f6da9d7760 Give valid swagger. Split out rule/ruleset to separate definitions. 2015-10-08 09:57:40 +01:00
Oddvar Lovaas 2ab9372b16 new nav bar. todo: get animation working. 2015-10-07 18:05:50 +01:00
Kegan Dougal db25276856 Start adding in push definitions 
This is going to be painful to represent due to how the push API allows
mixed types (strings or objects) and mixed top-level keys ("content" rule kind
allowing "pattern" as a top-level key). We may wish to re-visit the design
of this API for v2.
 2015-10-07 17:44:05 +01:00
Kegan Dougal 9540069acd Use valid JSON 2015-10-07 16:06:11 +01:00