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

1814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oddvar Lovaas 9e58f4236a Re-write F-droid paragraph 2016-09-14 17:24:21 +01:00
Oddvar Lovaas bdc869d8e7 Merge pull request #382 from exul/faq/client-and-server-questions 
Split Implementation into Clients and Server and add questions
 2016-09-14 16:45:57 +01:00
Andreas Brönnimann a89669aa1f Add new questions about servers and clients 
Also fix some outdate questions

Signed-off-by: Andreas Brönnimann <foss@exul.org>
 2016-09-08 21:45:47 +02:00
Andreas Brönnimann f4c093a58d Split Implementations into Servers and Clients 
Signed-off-by: Andreas Brönnimann <foss@exul.org>
 2016-09-08 21:29:17 +02:00
Richard van der Hoff 65d1888e08 Merge pull request #381 from matrix-org/dbkr/clarify_highlight_and_sound 
Clarify `highlight` and `sound` tweaks.
 2016-09-08 13:06:46 +01:00
David Baker 9a1db01d92 Clarify highlight and sound tweaks. 2016-09-08 11:59:49 +01:00
Richard van der Hoff 026a507380 Merge pull request #379 from Ralith/nix-shell 
Add a nix-shell environment suitable for building
 2016-08-31 10:38:03 +01:00
Richard van der Hoff 4833710bc5 Merge pull request #378 from Ralith/redaction 
Fix inconsistencies regarding redacted_because
 2016-08-31 10:37:09 +01:00
Benjamin Saunders 33d80408e0 Add a nix-shell environment suitable for building 
This enables easy execution of scripts/*.py by Nix users.

Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
 2016-08-30 21:26:35 -07:00
Benjamin Saunders cade909e25 Fix inconsistencies regarding redacted_because 
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
 2016-08-30 21:18:55 -07:00
Richard van der Hoff 69b1827b10 Merge pull request #380 from matrix-org/rav/doc_accountdata_key 
Add top-level account_data to /sync response
 2016-08-30 17:58:08 +01:00
Richard van der Hoff 7478e7f3cf Add top-level account_data to /sync response 2016-08-30 17:43:20 +01:00
Richard van der Hoff 0474010d47 Merge pull request #376 from Ralith/user_id-sender 
Fix some obsolete uses of user_id key in events
 2016-08-30 16:02:05 +01:00
Benjamin Saunders 77b668a5dc Fix some obsolete uses of user_id key in events 
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
 2016-08-26 23:06:41 -07:00
Richard van der Hoff 2fa7aac3be Merge pull request #377 from Ralith/typos 
Fix typo
 2016-08-26 10:28:52 +01:00
Benjamin Saunders 80bfbbdd33 Fix typo 
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
 2016-08-26 02:23:16 -07:00
Oddvar Lovaas 3beffc66cb Move purple-matrix to client list 2016-08-23 13:44:07 +01:00
Oddvar Lovaas df8805155d Merge pull request #375 from davidar/patch-1 
Update 2015-06-26-tensor.md
 2016-08-23 12:38:31 +02:00
David A Roberts 7935caf388 Update 2015-06-26-tensor.md 2016-08-23 20:14:37 +10:00
Richard van der Hoff 6c78a6aab0 Merge pull request #374 from matrix-org/matthew/fix_state_sending_desc 
fix the descriptions of the /room/.../state APIs to not be the wrong way round
 2016-08-18 15:01:44 +01:00
Matthew Hodgson 978d9ea6dd fix the descriptions of the /room/.../state APIs to not be the wrong way round 2016-08-18 14:04:21 +01:00
Oddvar Lovaas 16a4903656 Moved to correct date 2016-08-17 16:51:14 +01:00
Oddvar Lovaas b45425938c Add gitter bridges 2016-08-17 16:48:10 +01:00
David Baker fd888fcbda Merge pull request #373 from matrix-org/dbkr/contains_display_name_override 
Make the display name rule an override rule
 2016-08-17 09:43:44 +01:00
David Baker 311c0a6eb5 Hopefully correct indentation on changelog 2016-08-17 09:42:46 +01:00
David Baker 9fb68f54ce Changelog 2016-08-16 18:16:47 +01:00
Richard van der Hoff 512b0c5564 Merge pull request #372 from matrix-org/dbkr/add_dot 
Add dot prefix to .rule.master
 2016-08-16 08:28:49 +01:00
David Baker b65b0d049e Make the display name rule an override rule 2016-08-15 18:32:35 +01:00
David Baker 6592646ee9 Add dot prefix to .rule.master 
It's a default rule, so it needs a dot
 2016-08-15 18:29:39 +01:00
Richard van der Hoff 6a4f65d78f update c-s changelog 2016-08-15 13:50:58 +01:00
David Baker c494adf92c Merge pull request #371 from matrix-org/rav/auth_clarifications 
Clarifications to authentication mechanisms
 2016-08-15 13:23:15 +01:00
Richard van der Hoff c51c4acf7f Clarifications to authentication mechanisms 
* Make the purpose of the `auth` key in /register requests explicit, and say
  that it should be empty at first.

* Restructure the UA-auth section a bit.

* In the UA-auth section, say that clients should submit no `auth` to start
  with, and add 'Stage 0' representing  this to the example.

* s/{stage,login} type/authentication type/ in the UA-auth section. Seems
   clearer to me.

* Try to distinguish the example responses from the example requests by giving
  an HTTP header.
 2016-08-15 10:28:15 +01:00
Oddvar Lovaas 5ab7ba282d Add matrix-appservice-rocketchat 2016-08-12 16:17:13 +01:00
Oddvar Lovaas 0ef196f545 Add Nervewire 2016-08-12 12:53:34 +01:00
Richard van der Hoff 4ace92bca3 Merge pull request #370 from Ralith/origin_server_ts 
Specify requirement of origin_server_ts
 2016-08-12 10:08:02 +01:00
Benjamin Saunders 1c02ff5249 Specify requirement of origin_server_ts 
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
 2016-08-12 01:49:14 -07:00
Oddvar Lovaas fee90f135b Update instructions 2016-08-11 17:07:12 +01:00
Oddvar Lovaas cffd4c34ea Change to sorting by date (mostly) 2016-08-11 17:05:50 +01:00
Matthew Hodgson 9cb626982a s/user/username/ typo 2016-08-10 18:09:44 -05:00
Matthew Hodgson 1551e34ea5 Merge pull request #369 from sim6/fix_faq_federation_api_link 
Fix FAQ Federation API link
 2016-08-09 17:21:56 -05:00
Matthew Hodgson 946374a737 Merge pull request #368 from sim6/format_faq_links 
Format FAQ links
 2016-08-09 17:21:36 -05:00
Simó Albert i Beltran a90074ec78 Fix FAQ Federation API link 
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
 2016-08-09 23:26:00 +02:00
Simó Albert i Beltran 82897a52a1 Format FAQ links 
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
 2016-08-09 23:21:09 +02:00
Richard van der Hoff e910a39594 Merge pull request #367 from matrix-org/rav/document_cas_login 
document CAS login and m.login.token login
 2016-08-09 16:48:08 +01:00
Richard van der Hoff 07fa64d73d Update changelog 2016-08-09 16:46:49 +01:00
Richard van der Hoff 0248afe6ac login with invalid token gives a 403 2016-08-09 16:28:29 +01:00
Richard van der Hoff 1f1dfdd91c More clarifications 2016-08-09 15:51:12 +01:00
Richard van der Hoff ec81b4c9fe More PR feedback 
Add a couple of TODO sections
 2016-08-09 12:16:20 +01:00
Richard van der Hoff 4b0e546eeb PR feedback 
Fix some typos, and clarify several aspects of server behaviour.
 2016-08-09 12:02:38 +01:00
Richard van der Hoff 41368dc5a7 document CAS login 
Following the spirit of "document how it is, not how we wish it was", document
the CAS login bits.
 2016-08-08 17:33:48 +01:00