65d1888e08
Merge pull request #381 from matrix-org/dbkr/clarify_highlight_and_sound
...
Clarify `highlight` and `sound` tweaks.
8 years ago
9a1db01d92
Clarify `highlight` and `sound` tweaks.
8 years ago
026a507380
Merge pull request #379 from Ralith/nix-shell
...
Add a nix-shell environment suitable for building
8 years ago
4833710bc5
Merge pull request #378 from Ralith/redaction
...
Fix inconsistencies regarding redacted_because
8 years ago
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>
8 years ago
cade909e25
Fix inconsistencies regarding redacted_because
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
69b1827b10
Merge pull request #380 from matrix-org/rav/doc_accountdata_key
...
Add top-level account_data to /sync response
8 years ago
7478e7f3cf
Add top-level account_data to /sync response
8 years ago
0474010d47
Merge pull request #376 from Ralith/user_id-sender
...
Fix some obsolete uses of user_id key in events
8 years ago
77b668a5dc
Fix some obsolete uses of user_id key in events
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
2fa7aac3be
Merge pull request #377 from Ralith/typos
...
Fix typo
8 years ago
80bfbbdd33
Fix typo
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
3beffc66cb
Move purple-matrix to client list
8 years ago
df8805155d
Merge pull request #375 from davidar/patch-1
...
Update 2015-06-26-tensor.md
8 years ago
7935caf388
Update 2015-06-26-tensor.md
8 years ago
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
8 years ago
978d9ea6dd
fix the descriptions of the /room/.../state APIs to not be the wrong way round
8 years ago
16a4903656
Moved to correct date
8 years ago
b45425938c
Add gitter bridges
8 years ago
fd888fcbda
Merge pull request #373 from matrix-org/dbkr/contains_display_name_override
...
Make the display name rule an override rule
8 years ago
311c0a6eb5
Hopefully correct indentation on changelog
8 years ago
9fb68f54ce
Changelog
8 years ago
512b0c5564
Merge pull request #372 from matrix-org/dbkr/add_dot
...
Add dot prefix to .rule.master
8 years ago
b65b0d049e
Make the display name rule an override rule
8 years ago
6592646ee9
Add dot prefix to .rule.master
...
It's a default rule, so it needs a dot
8 years ago
6a4f65d78f
update c-s changelog
8 years ago
c494adf92c
Merge pull request #371 from matrix-org/rav/auth_clarifications
...
Clarifications to authentication mechanisms
8 years ago
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.
8 years ago
5ab7ba282d
Add matrix-appservice-rocketchat
8 years ago
0ef196f545
Add Nervewire
8 years ago
4ace92bca3
Merge pull request #370 from Ralith/origin_server_ts
...
Specify requirement of origin_server_ts
8 years ago
1c02ff5249
Specify requirement of origin_server_ts
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
fee90f135b
Update instructions
8 years ago
cffd4c34ea
Change to sorting by date (mostly)
8 years ago
9cb626982a
s/user/username/ typo
8 years ago
1551e34ea5
Merge pull request #369 from sim6/fix_faq_federation_api_link
...
Fix FAQ Federation API link
8 years ago
946374a737
Merge pull request #368 from sim6/format_faq_links
...
Format FAQ links
8 years ago
a90074ec78
Fix FAQ Federation API link
...
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
8 years ago
82897a52a1
Format FAQ links
...
Signed-off-by: Simó Albert i Beltran <sim6@probeta.net>
8 years ago
e910a39594
Merge pull request #367 from matrix-org/rav/document_cas_login
...
document CAS login and m.login.token login
8 years ago
07fa64d73d
Update changelog
8 years ago
0248afe6ac
login with invalid token gives a 403
8 years ago
1f1dfdd91c
More clarifications
8 years ago
ec81b4c9fe
More PR feedback
...
Add a couple of TODO sections
8 years ago
4b0e546eeb
PR feedback
...
Fix some typos, and clarify several aspects of server behaviour.
8 years ago
41368dc5a7
document CAS login
...
Following the spirit of "document how it is, not how we wish it was", document
the CAS login bits.
8 years ago
20eab7714f
Merge pull request #366 from matrix-org/markjh/filename
...
Document the optional parameter for specifying a filename
8 years ago
f3d6f6a387
Remove spare ()
8 years ago
04b71fb571
Add NaChat and Twitter bridgew1
8 years ago
ba64d9fe5a
Remove thing from jenkins.sh
8 years ago
Richard van der Hoff