Commit graph

2167 commits

Author SHA1 Message Date
Richard van der Hoff
b0ea6038c6 Move jekyll back out of matrix-doc again
Having the jekyll assets here is a mistake, because they need to be versioned
separately to the spec: we keep old versions of the spec, but they sometimes
need to be restyled to match the latest website.
2017-08-03 15:49:17 +01:00
Richard van der Hoff
8a66b1a68b Build the spec as part of the build 2017-08-03 00:18:07 +01:00
Richard van der Hoff
0af06291fe Hardcode client major version r0 2017-08-02 21:58:52 +01:00
Richard van der Hoff
986e51cf35 Gendoc: allow overriding the dest dir 2017-08-02 21:48:07 +01:00
Richard van der Hoff
2519b78814 install PyYAML 2017-08-02 16:32:19 +01:00
Richard van der Hoff
35ae69f2e1 Use a virtualenv 2017-08-02 16:30:49 +01:00
Richard van der Hoff
9d2a93ad7b Run jekyll as part of the matrix-doc build
- this saves us having to run it manually on the web server.
2017-08-02 16:20:46 +01:00
Richard van der Hoff
299b60970b Merge pull request #918 from shawnanastasio/master
supporting-docs/projects: Add matrix-pollbot
2017-08-02 14:37:26 +01:00
Richard van der Hoff
b8ac9fdefa Merge pull request #960 from matrix-org/babolivier/fix-get-room-alias
Fix response format and 404 example for room alias lookup
2017-08-02 14:20:17 +01:00
Richard van der Hoff
4a4ca9e39b Merge pull request #964 from t3chguy/patch-2
fix react-sdk link
2017-08-02 14:18:41 +01:00
Richard van der Hoff
a545392e73 Merge pull request #963 from krombel/patch-2
Fix inconsistency: `join_rules` => `join_rule`
2017-08-02 14:17:41 +01:00
Michael Telatynski
a9d9f58229 fix react-sdk link 2017-08-02 14:12:33 +01:00
krombel
f8ce497bd6 Fix inconsistency: join_rules => join_rule
All other docs do not have `join_rules` but `join_rule`
This PR fix this inconsistency.

Mentioned by @digital:sorunome.de in [#matrix-dev:matrix.org](https://matrix.to/#/!XqBunHwQIXUiqCaoxq:matrix.org/$150142347531959wjGGm:sorunome.de)
2017-07-31 12:04:24 +02:00
Brendan Abolivier
25f23873d4
Update changelog 2017-07-27 17:45:14 +01:00
Brendan Abolivier
fee65dbacb
Fix response format and 404 example for room alias lookup 2017-07-27 17:43:49 +01:00
Richard van der Hoff
7cec016256 Merge pull request #959 from QMatrixClient/master
libqmatrixclient minor changes
2017-07-24 10:03:24 +01:00
Kitsune Ral
112ba5566e Fixed typo and other polishing 2017-07-24 11:51:04 +09:00
Richard van der Hoff
14e36b7d6f Merge pull request #954 from ptman/master
Don't give false hope about up-to-date docs
2017-07-19 09:37:44 +01:00
Paul Tötterman
94ded5fff7 Don't give false hope about up-to-date docs 2017-07-19 11:19:09 +03:00
Brendan Abolivier
750d980bc0 Room member (#950)
* Fixed an incorrect membership on example
* Added precision on membership upon profile update
* Changed first example into a join
* Changed the state/{eventType}/{stateKey} example with an actual state key
2017-07-14 15:30:56 +01:00
Kegsay
e641897d88 Merge pull request #930 from matrix-org/leonerd/circle
Remove Net::Async::Matrix client; expand Circle entry
2017-07-05 16:34:58 +01:00
Kegsay
2b9dbd3a6c Merge pull request #947 from t3chguy/patch-1
redacts is an eventID not a roomID (! -> $)
2017-07-05 16:31:02 +01:00
Michael Telatynski
852f4edead redacts is an eventID not a roomID (! -> $) 2017-07-05 16:18:49 +01:00
Richard van der Hoff
e75b22ba31 Merge pull request #944 from turt2live/travis/summer-2017-sync
Synchronize the projects I work on with matrix-doc
2017-07-04 09:57:59 +01:00
turt2live
6423901ce3 Use consistent labels for project statuses 2017-07-03 16:08:55 -06:00
turt2live
54760ad0dd Add rocket-sheep 2017-07-03 16:08:22 -06:00
turt2live
847730109f Add matrix-embedded-federation 2017-07-03 16:02:50 -06:00
turt2live
9d396242d3 Add matrix-topic-bot 2017-07-03 15:57:41 -06:00
Richard van der Hoff
e04a3819a5 Merge pull request #943 from krombel/patch-1
Add link to draft for WebSocketAPI on Google-Docs
2017-07-03 12:44:31 +01:00
Richard van der Hoff
1f12d9114c Riot project: improve readability 2017-07-03 12:20:12 +01:00
Richard van der Hoff
ce922d6bb9 Merge pull request #941 from patch-forks/patch-1
fix for some markdown-links
2017-07-03 12:12:19 +01:00
krombel
81ea7058a5 Add link to draft for WebSocketAPI on Google-Docs 2017-06-30 13:32:12 +02:00
DYM
9538bf55a8 markdown 2017-06-27 13:11:17 +02:00
Richard van der Hoff
4be25ca6b4 Merge pull request #939 from maxidor/matrix-sync-java-sdk
"Try Matrix!" page for Matrix Java SDK
2017-06-21 08:03:18 +01:00
Max Dor
39d516ae1e "Try Matrix!" page for Matrix Java SDK 2017-06-21 03:13:26 +02:00
Matthew Hodgson
b4dc6fd4f6 Merge pull request #936 from anoadragon453/patch-1
Tox.im -> Tox.chat
2017-06-15 10:12:59 +01:00
anoadragon453
914ffa62ad Tox.im -> Tox.chat
https://tox.chat is the Tox project's official homepage, while Tox.im is their old page, that seems to have been taken over by a squatter linking to an old blog post.

Don't want to mislead people :)
2017-06-15 02:09:50 -07:00
Paul "LeoNerd" Evans
d755d97916 Add a screenshot for Circle+Matrix; expand on the instructions making them more matrix-specific 2017-06-05 11:59:24 +01:00
Paul "LeoNerd" Evans
4e64720be5 Remove the NaMatrix client entry as it's now dead 2017-06-05 11:46:05 +01:00
Matthew Hodgson
f147533ea3 Merge pull request #927 from maxidor/mxisd-1
Update mxisd project description
2017-05-24 18:43:25 +01:00
Max Dor
37be6feb72 Update mxisd project description 2017-05-24 17:41:28 +02:00
Matthew Hodgson
f6a8fea3a4 Merge pull request #924 from Matrixcoffee/patch-1
Update 2017-05-02-matrix-knowledge-base.md
2017-05-24 16:37:49 +01:00
Matthew Hodgson
6bf33feac9 Merge pull request #925 from QMatrixClient/master
Update Quaternion and libqmatrixclient records
2017-05-24 16:37:41 +01:00
Matthew Hodgson
3a5da0472b Merge pull request #926 from maxidor/master
Create matrix-appservice-email project page
2017-05-24 16:37:14 +01:00
Max Dor
1b3e1a0a88 Create matrix-appservice-email project page 2017-05-24 17:16:15 +02:00
Kitsune Ral
06719c9b95 Update Quaternion and libqmatrixclient records 2017-05-24 16:00:22 +09:00
Matrixcoffee
fc4bef93da Update 2017-05-02-matrix-knowledge-base.md 2017-05-23 22:13:07 +00:00
Shawn Anastasio
2a8d64fef7 supporting-docs/projects: Add matrix-pollbot
matrix-pollbot is a bot that allows you to create polls to be voted on by
members of a Matrix room.
2017-05-18 05:05:07 -05:00
Matthew Hodgson
6a048acd30 move gomatrix to the right place 2017-05-03 00:53:56 +01:00
Matthew Hodgson
7f2ed4efb7 typo 2017-05-03 00:51:08 +01:00