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

2883 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oddvar Lovaas 2ea621d540 Add matrix-appservice-gitter-twisted 2016-12-16 15:39:28 +00:00
Oddvar Lovaas 3cad61f95e Add matrix-rocketchat 2016-12-16 15:37:18 +00:00
Oddvar Lovaas 41cbd997d7 Add imessage-bridge 2016-12-16 14:53:02 +00:00
Oddvar Lovaas 1774757807 Add matrix-pushgw 2016-12-16 14:43:15 +00:00
Oddvar Lovaas d1cb5e3d0c Add matrix-fb-chat 2016-12-16 14:39:05 +00:00
Oddvar Lovaas 05750d649f Add mm 2016-12-07 17:51:46 +00:00
Oddvar Lovaas 46eef3d32e Add new projects (interlocutor, node-red-nodes, matrex, gomatrix and matrix-live) 2016-12-01 18:03:47 +00:00
Richard van der Hoff 6b927cb2fb Merge pull request #752 from kyrias/age-field 
Clarify that age is generated on the local HS
 2016-12-01 10:20:12 +00:00
Johannes Löthberg c1b375b2ac Clarify that age is generated on the local HS 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-11-30 23:12:47 +01:00
Richard van der Hoff b21707659f delete macaroons draft 
We're no longer mandating macaroons in the spec; accordingly this doc has no place here.

It was also somewhat out of sync with the impl.
 2016-11-30 16:42:06 +00:00
David Baker 19d1b54920 Merge pull request #751 from matrix-org/rav/guest_e2e 
Allow guest access to E2E endpoints
 2016-11-30 16:39:14 +00:00
Richard van der Hoff 5537f7a832 Allow guest access to E2E endpoints 2016-11-30 16:12:17 +00:00
Richard van der Hoff 3265a9dde3 Merge pull request #750 from kyrias/notice-language 
Make m.notice description use stricter language
 2016-11-30 16:07:18 +00:00
Johannes Löthberg a8b253889b Add m.notice description rephrasing to changelog 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-11-30 14:55:46 +01:00
Johannes Löthberg d9894aeffd Make m.notice description use stricter language 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-11-30 00:59:51 +01:00
Richard van der Hoff 8a9629167a httpsify the speculator link 2016-11-27 17:28:56 +00:00
Oddvar Lovaas 18a83ea299 Add Freebird 2016-11-24 16:51:39 +00:00
Oddvar Lovaas 83f58baba2 Add j 2016-11-22 18:10:28 +00:00
Richard van der Hoff 7adf95b4ad Merge pull request #740 from matrix-org/rav/fix_736 
Set default account 'kind' to 'user'
 2016-11-22 09:52:19 +00:00
Richard van der Hoff c83a556097 Set default account 'kind' to 'user' 
Fixes https://github.com/matrix-org/matrix-doc/issues/736
 2016-11-21 17:54:47 +00:00
Richard van der Hoff 02a8715197 Merge pull request #388 from matrix-org/erikj/public_rooms 
New /publicRoom APIs
 2016-11-21 13:13:45 +00:00
Richard van der Hoff c175039a08 Final public_rooms clarifications 
* order by *joined* members
 * clarify pagination direction behaviour
 2016-11-21 13:08:41 +00:00
Richard van der Hoff dca1d0c745 Merge branch 'master' into erikj/public_rooms 2016-11-21 12:22:08 +00:00
Oddvar Lovaas 9debd7c1ad Add Hangouts Bridge 2016-11-16 15:34:53 +00:00
Oddvar Lovaas 42f7aed69a Add fork of matrix-xmpp-bridge 2016-11-16 15:28:10 +00:00
Oddvar Lovaas e5bd9deeeb Add Hello Matrix Bot and fix link in faq 2016-11-11 16:54:39 +00:00
Richard van der Hoff 4abdcc6f05 Merge pull request #402 from matrix-org/rav/device_management 
Device management API
 2016-11-09 15:09:46 +00:00
Oddvar Lovaas 32cc1ded86 Update PTO; add matrix-ircd 2016-11-09 14:55:20 +00:00
Oddvar Lovaas d5b3af0228 Add Revolt 2016-11-09 14:55:01 +00:00
Richard van der Hoff 2bf0abcb9d Add missing tag to PUT /devices/{deviceId} 2016-11-09 14:37:34 +00:00
Richard van der Hoff 461bfdb0d8 Merge branch 'master' into rav/device_management 2016-11-09 14:34:04 +00:00
Richard van der Hoff b26c84a290 Fix schema validation fail 2016-11-09 14:33:45 +00:00
Richard van der Hoff 07dbf6fcf6 Add doc for PUT /devices/{deviceId} 
Oops, forgot this.
 2016-11-09 14:25:31 +00:00
Oddvar Lovaas 8172455609 Merge pull request #717 from anewusername/master 
Add mxpp to projects
 2016-11-09 14:24:25 +00:00
Oddvar Lovaas c8e279c317 Merge pull request #722 from matrix-org/rav/e2e_guide_link 
Add e2e guide to guides index
 2016-11-09 14:12:14 +00:00
Richard van der Hoff aecac4f931 Merge pull request #723 from matrix-org/markjh/thumbnail_url 
Move m.* thumbnail_url to be inside info to match m.video
 2016-11-07 19:04:14 +00:00
Mark Haines 7025793ca8 Say that thumbnails should be 'mxc://' 2016-11-07 16:17:25 +00:00
Mark Haines 6f1c598db8 Make the key orders consistent 2016-11-07 14:54:59 +00:00
Mark Haines 05001bcaa6 Fix whitepace 2016-11-07 14:32:48 +00:00
Mark Haines 29e33deeb5 Fix m.location example 2016-11-07 14:31:29 +00:00
Mark Haines 30f9ea0225 Spelling 2016-11-07 14:30:16 +00:00
Mark Haines 5ccf41bafc Add type: object 2016-11-07 14:29:17 +00:00
Mark Haines 6ecb5d0729 re-order thumbnail keys 2016-11-07 14:28:19 +00:00
Mark Haines 4349982189 Fix path 2016-11-07 10:54:02 +00:00
Mark Haines 2fdca5a995 Add a thumbnail_info common schema, deduplicate m.room.avatar and m.room.message#m.image 2016-11-07 10:50:52 +00:00
Mark Haines 1b661b64dc Move m.location thumbnail_url to be inside info to match m.video 2016-11-04 14:59:39 +00:00
Mark Haines 14d05464ee Move m.file thumbnail_url to be inside info to match m.video 2016-11-04 14:57:45 +00:00
Mark Haines 25b41c7551 Move m.image thumbnail_url to be inside info to match m.video 2016-11-04 14:52:01 +00:00
Richard van der Hoff 1cd63bd0db Add e2e guide to guides index 
Fixes #721
 2016-11-04 08:46:36 +00:00
Richard van der Hoff 22ae6528c7 Merge pull request #718 from matrix-org/rav/move_signing_json 
Move 'Signing JSON' to appendices
 2016-10-31 14:32:43 +00:00