Kegan Dougal
|
fa055e14ad
|
Merge branch 'master' into as-http-api
|
10 years ago |
|
Kegan Dougal
|
6c21f499e8
|
Final syntax fixes
|
10 years ago |
|
Kegan Dougal
|
047355b5c9
|
More syntax fixes
|
10 years ago |
|
Kegan Dougal
|
3b696878f5
|
Fix a bunch of rst syntax errors.
|
10 years ago |
|
Kegan Dougal
|
b01e8165d0
|
Update JSFiddles/how-to to support the new registration format.
|
10 years ago |
|
Kegan Dougal
|
c19bced03d
|
Update jsfiddles to have more helpful error messages when there is no connection when logging in.
|
10 years ago |
|
Kegan Dougal
|
07399b0966
|
Added demo.details
|
10 years ago |
|
Kegan Dougal
|
5614f7051b
|
Updated howto.rst to use the new APIs. Updated JSFiddles to use 8008. Linked new fiddles with howto.rst. Added more explanations.
|
10 years ago |
|
Matthew Hodgson
|
ca0a642e66
|
change the world: make the default matrix API URL prefix /_matrix rather than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions.
perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js
|
10 years ago |
|
Kegan Dougal
|
1f3811b1b8
|
Fix JSFiddles to work with the new C-S API.
|
10 years ago |
|
Kegan Dougal
|
d5da30422c
|
Added final jsfiddle: an example app demonstrating most of the c2s api.
|
10 years ago |
|
Kegan Dougal
|
eee7cd7730
|
Added more jsfiddles.
|
10 years ago |
|
Kegan Dougal
|
8fb3367238
|
More fiddles, more fun!
|
10 years ago |
|
Kegan Dougal
|
3dafe4133c
|
Added registration/login jsfiddle, formatted so it can be loaded directly from jsfiddle. Requires jQuery 1.8.3
|
10 years ago |
|
Matthew Hodgson
|
9a9d4b15d2
|
Merge pull request #8 from matrix-org/spec-18
Add spec for m.notice (SPEC-18)
|
10 years ago |
|
Paul "LeoNerd" Evans
|
a9a4c46a57
|
Add spec for m.notice (SPEC-18)
|
10 years ago |
|
Kegsay
|
bd48e4ab6d
|
Move invite data to a note
Done in order to clarify that this API "should probably have something like this" rather than "will have this".
|
10 years ago |
|
Kegsay
|
e309db547a
|
Specifically reference join_rules
In reference to SPEC-63
|
10 years ago |
|
Kegsay
|
03eaa21508
|
Add blurb on invites for initialSync
|
10 years ago |
|
Kegsay
|
51a7681ece
|
Merge pull request #4 from matrix-org/use-cases
Add Client-Server v2 General API Design
|
10 years ago |
|
Kegsay
|
fcbdc39674
|
Add section on device IDs for reg/login
Final cleanup before merge
|
10 years ago |
|
Kegsay
|
ccf8408e92
|
More tweaks from comments
|
10 years ago |
|
Kegsay
|
31deddccdf
|
Add presence API from notes
|
10 years ago |
|
Kegan Dougal
|
62471348ca
|
This is a comment, not a directive. Remove ::
|
10 years ago |
|
Kegan Dougal
|
109c8a97a8
|
Use title heading sizings of =,-,~,+ since that is what most of our docs use. Inconsistent use breaks when you try to merge them.
|
10 years ago |
|
Erik Johnston
|
5279541c28
|
Update erikj_federation.rst
Update state resolution rules to indicate what you should do if none of the merged events are allowed by the newly merged auth events.
|
10 years ago |
|
Kegsay
|
3b35e95630
|
Tweaks based on feedback
|
10 years ago |
|
Kegsay
|
61b8664286
|
Clarify profile propagation section more
|
10 years ago |
|
Kegsay
|
a1964b466b
|
Add profile propagation notes
After much IRL discussion
|
10 years ago |
|
Kegsay
|
ef0091f3f2
|
Remove session section
This is no longer required.
|
10 years ago |
|
Erik Johnston
|
38efa9c5c2
|
Reword auth resolution section
|
10 years ago |
|
Erik Johnston
|
91aba39fe7
|
Reword note about auth chains
|
10 years ago |
|
Erik Johnston
|
5f99858575
|
Mention possible types for auth events.
|
10 years ago |
|
Erik Johnston
|
bb968e5bdd
|
Clarify m.room.create auth
|
10 years ago |
|
Erik Johnston
|
78a697c535
|
Briefly touch on how to handle incoming events
|
10 years ago |
|
Erik Johnston
|
406742afaa
|
A few notes on how we could do state resolution of auth events
|
10 years ago |
|
Erik Johnston
|
4b76181f74
|
Rearrange sections
|
10 years ago |
|
Matthew Hodgson
|
3c16dbd63b
|
it's 2015
|
10 years ago |
|
Erik Johnston
|
b28f404240
|
Add ToC
|
10 years ago |
|
Erik Johnston
|
7108316ea8
|
Mention the fields that the server should compute when creating events
|
10 years ago |
|
Erik Johnston
|
232e2675dd
|
Brief mention of state conflict resolution
|
10 years ago |
|
Erik Johnston
|
f09e5a676f
|
Mention state resolution algorithm
|
10 years ago |
|
Erik Johnston
|
7d32717c9b
|
A couple of more notes on auth resolution.
|
10 years ago |
|
Kegan Dougal
|
68c774689a
|
Add stub AS HTTP API doc
|
10 years ago |
|
Mark Haines
|
ee41165610
|
Remove cs-v2-http-api since it's in the client_server_v2_http_api branch now
|
10 years ago |
|
Mark Haines
|
6324f8c1ca
|
Fix the size of the reference id hash tuple
|
10 years ago |
|
Erik Johnston
|
90ad08e866
|
Merge branch 'master' of github.com:matrix-org/matrix-doc
|
10 years ago |
|
Erik Johnston
|
48f9670b87
|
More comments on auth chain resolution
|
10 years ago |
|
Kegsay
|
4b23a16abb
|
Few minor RST tweaks
|
10 years ago |
|
Kegsay
|
8ca0c65fd3
|
RST Formatting for github
|
10 years ago |