Oddvar Lovaas
6d7f543612
Merge pull request #385 from freelock/master
...
Drupal API module and Concourse Notification Resource additions to Try Matrix page
8 years ago
John Locke
c010173381
Add Drupal Matrix_api module to Try Matrix page
8 years ago
John Locke
c08aa51b18
Add concourse notification resource to Try Matrix page
8 years ago
Oddvar Lovaas
1ea836bb1b
Remove howtos from build script
8 years ago
Oddvar Lovaas
d7d7f53884
Remove duplicates, add redirect
8 years ago
Oddvar Lovaas
7b559686d5
Merge pull request #384 from matrix-org/rav/misc_docs
...
Miscellaneous doc fixes
8 years ago
Richard van der Hoff
11961247f7
Miscellaneous doc fixes
...
Fix some egregious lies and oldthings in the getting-involved and faq pages.
8 years ago
Richard van der Hoff
09c4701524
Merge pull request #383 from matthiasbeyer/fix-link-markup
...
Fix link markup
8 years ago
Matthias Beyer
cefb63dd80
Fix link markup
8 years ago
Oddvar Lovaas
edcab06e2d
Fix spacing, re-add ios redirect page
8 years ago
Oddvar Lovaas
6e915b9119
Rename Vector -> Riot
8 years ago
Oddvar Lovaas
9e58f4236a
Re-write F-droid paragraph
8 years ago
Oddvar Lovaas
bdc869d8e7
Merge pull request #382 from exul/faq/client-and-server-questions
...
Split Implementation into Clients and Server and add questions
8 years ago
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>
8 years ago
Andreas Brönnimann
f4c093a58d
Split Implementations into Servers and Clients
...
Signed-off-by: Andreas Brönnimann <foss@exul.org>
8 years ago
Richard van der Hoff
65d1888e08
Merge pull request #381 from matrix-org/dbkr/clarify_highlight_and_sound
...
Clarify `highlight` and `sound` tweaks.
8 years ago
David Baker
9a1db01d92
Clarify `highlight` and `sound` tweaks.
8 years ago
Richard van der Hoff
026a507380
Merge pull request #379 from Ralith/nix-shell
...
Add a nix-shell environment suitable for building
8 years ago
Richard van der Hoff
4833710bc5
Merge pull request #378 from Ralith/redaction
...
Fix inconsistencies regarding redacted_because
8 years ago
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>
8 years ago
Benjamin Saunders
cade909e25
Fix inconsistencies regarding redacted_because
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Richard van der Hoff
69b1827b10
Merge pull request #380 from matrix-org/rav/doc_accountdata_key
...
Add top-level account_data to /sync response
8 years ago
Richard van der Hoff
7478e7f3cf
Add top-level account_data to /sync response
8 years ago
Richard van der Hoff
0474010d47
Merge pull request #376 from Ralith/user_id-sender
...
Fix some obsolete uses of user_id key in events
8 years ago
Benjamin Saunders
77b668a5dc
Fix some obsolete uses of user_id key in events
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Richard van der Hoff
2fa7aac3be
Merge pull request #377 from Ralith/typos
...
Fix typo
8 years ago
Benjamin Saunders
80bfbbdd33
Fix typo
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Oddvar Lovaas
3beffc66cb
Move purple-matrix to client list
8 years ago
Oddvar Lovaas
df8805155d
Merge pull request #375 from davidar/patch-1
...
Update 2015-06-26-tensor.md
8 years ago
David A Roberts
7935caf388
Update 2015-06-26-tensor.md
8 years ago
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
8 years ago
Matthew Hodgson
978d9ea6dd
fix the descriptions of the /room/.../state APIs to not be the wrong way round
8 years ago
Oddvar Lovaas
16a4903656
Moved to correct date
8 years ago
Oddvar Lovaas
b45425938c
Add gitter bridges
8 years ago
David Baker
fd888fcbda
Merge pull request #373 from matrix-org/dbkr/contains_display_name_override
...
Make the display name rule an override rule
8 years ago
David Baker
311c0a6eb5
Hopefully correct indentation on changelog
8 years ago
David Baker
9fb68f54ce
Changelog
8 years ago
Richard van der Hoff
512b0c5564
Merge pull request #372 from matrix-org/dbkr/add_dot
...
Add dot prefix to .rule.master
8 years ago
David Baker
b65b0d049e
Make the display name rule an override rule
8 years ago
David Baker
6592646ee9
Add dot prefix to .rule.master
...
It's a default rule, so it needs a dot
8 years ago
Richard van der Hoff
6a4f65d78f
update c-s changelog
8 years ago
David Baker
c494adf92c
Merge pull request #371 from matrix-org/rav/auth_clarifications
...
Clarifications to authentication mechanisms
8 years ago
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.
8 years ago
Oddvar Lovaas
5ab7ba282d
Add matrix-appservice-rocketchat
8 years ago
Oddvar Lovaas
0ef196f545
Add Nervewire
8 years ago
Richard van der Hoff
4ace92bca3
Merge pull request #370 from Ralith/origin_server_ts
...
Specify requirement of origin_server_ts
8 years ago
Benjamin Saunders
1c02ff5249
Specify requirement of origin_server_ts
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
Oddvar Lovaas
fee90f135b
Update instructions
8 years ago
Oddvar Lovaas
cffd4c34ea
Change to sorting by date (mostly)
8 years ago
Matthew Hodgson
9cb626982a
s/user/username/ typo
8 years ago