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

2001 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard van der Hoff 3ee75af06f Move 'Signing JSON' to appendices 
Canonical JSON and JSON signing in general are common to the C-S spec. Move
them to the appendices instead of the S-S spec.
 2016-10-31 12:36:47 +00:00
Richard van der Hoff a5e12814ef Split appendices up 
Split appendices into multiple files
 2016-10-31 12:01:37 +00:00
jan 7b4bba5cba Add mxpp to projects 2016-10-30 19:25:27 -07:00
Richard van der Hoff 0c3ecad3d4 Merge pull request #416 from matrix-org/rav/e2e_impl_sign_one_time_keys 
E2e impl guide: sign one-time keys
 2016-10-24 15:06:05 +01:00
Richard van der Hoff e53e3ab01a remove unsigned prop for verifying 2016-10-24 14:59:47 +01:00
Richard van der Hoff f0f6ea0cb3 E2e impl guide: sign one-time keys 
We now sign our one-time keys.
 2016-10-24 13:52:34 +01:00
Richard van der Hoff 41a528c551 Merge pull request #413 from matrix-org/rav/e2e_impl/rotate_megolm_sessions 
E2E impl guide: Add details on rotating megolm sessions
 2016-10-23 11:10:38 +01:00
Mark Haines 8a99d531a9 Merge pull request #414 from matrix-org/markjh/replays 
Document the requirement that clients track the message_index
 2016-10-21 16:52:52 +01:00
Mark Haines cbf94c88c2 Move the __ to where it should be 2016-10-21 15:50:54 +01:00
Mark Haines 6a5b66d2d8 Document the where the client gets the message index from 2016-10-21 15:48:44 +01:00
Mark Haines 8641ef299e Document the requirement that clients track the message_index 2016-10-21 15:25:33 +01:00
Richard van der Hoff c576a72673 E2E impl guide: Add details on rotating megolm sessions 2016-10-21 13:50:58 +01:00
Mark Haines 888e6a9f3b Merge pull request #404 from uhoreg/patch-2 
add information about Perspectives
 2016-10-21 09:52:05 +01:00
Richard van der Hoff 41da7a989f Merge pull request #412 from matrix-org/rav/e2e_impl/check_uks_attacks 
E2E impl guide: Document unknown key-share mitigations
 2016-10-19 17:28:03 +01:00
Richard van der Hoff 657525d0f4 E2E impl guide: Document unknown key-share mitigations 
Document the fields to be added to Olm and the checks to be done to mitigate
the unknown key-share attacks.
 2016-10-19 17:06:52 +01:00
Richard van der Hoff d93ef05f5e Merge pull request #411 from matrix-org/rav/e2e_impl/check_user_ids 
E2E impl guide: check ids in device query
 2016-10-19 11:45:15 +01:00
Richard van der Hoff 4d221bf77d Merge pull request #410 from matrix-org/rav/y_u_no_disable_e2e 
Add an entry to the FAQ about disabling e2e
 2016-10-19 11:45:03 +01:00
Richard van der Hoff 4368134970 Remove spurious backslashes 2016-10-18 20:41:16 +01:00
Richard van der Hoff 157e51fbc9 E2E impl guide: check ids in device query 
Update the E2E impl guide to note that the user_id and device_id returned from
a device query need to be checked.
 2016-10-18 20:40:42 +01:00
Richard van der Hoff 4c008a4771 Merge branch 'rav/e2e_guide' 2016-10-18 18:25:40 +01:00
Richard van der Hoff 05ca311be3 Put the E2E guide under guides 2016-10-18 18:03:20 +01:00
Richard van der Hoff 66a50855ff Merge branch 'rav/e2e_guide' 
Land the E2E implementation guide
 2016-10-18 16:06:56 +01:00