Matthew Hodgson
7c65e4748e
typo
2015-02-12 20:24:14 +00:00
Matthew Hodgson
246531813b
typo
2015-02-12 20:23:43 +00:00
Kegan Dougal
8729cdb067
Fix broken JSFiddle links
2015-02-12 14:52:35 +00:00
Kegan Dougal
2b4641d1f0
Merge branch 'master' into v2-presence
2015-02-09 09:23:53 +00:00
Kegan Dougal
0131543f00
Merge branch 'master' into human-id-rules
2015-02-09 09:22:52 +00:00
Kegan Dougal
56f4467ced
Fix syntax error
2015-02-09 09:19:45 +00:00
Kegan Dougal
7a59d401f6
Fix syntax errors
2015-02-09 09:17:55 +00:00
Kegan Dougal
2740e50a9f
Merge branch 'master' into push
2015-02-09 09:14:39 +00:00
Kegan Dougal
74225013c5
Merge branch 'as-http-api' of github.com:matrix-org/matrix-doc into as-http-api
2015-02-09 09:13:52 +00:00
Kegan Dougal
fa055e14ad
Merge branch 'master' into as-http-api
2015-02-09 09:13:31 +00:00
Kegan Dougal
65b3cf3740
Merge branch 'master' into application-services
2015-02-09 09:12:58 +00:00
Matthew Hodgson
2c8b875cf1
typoe
2015-02-08 02:33:53 +00:00
Matthew Hodgson
6c5d07a0d1
typoe
2015-02-08 02:32:06 +00:00
Kegan Dougal
6c21f499e8
Final syntax fixes
2015-02-06 13:08:12 +00:00
Kegan Dougal
047355b5c9
More syntax fixes
2015-02-06 13:05:28 +00:00
Kegan Dougal
3b696878f5
Fix a bunch of rst syntax errors.
2015-02-06 12:59:08 +00:00
Kegsay
36395c2611
Add info on M_EXCLUSIVE
2015-02-06 11:01:20 +00:00
Kegsay
e7c522b606
Add information on exclusive namespaces
2015-02-05 16:06:47 +00:00
David Baker
7c0d1c86d8
How to tell server default rules from other rules.
2015-02-05 14:56:07 +00:00
David Baker
8360be247b
Leave out what characters are allowed in a rule ID as we allow most thigs in matrix usernames currently.
2015-02-05 13:15:34 +00:00
David Baker
94af47ffd4
Server default riules will have a rule_id when you need it to work out what the rule does.
2015-02-05 13:03:10 +00:00
David Baker
e6c9e77d35
Change server default rules.
2015-02-05 10:49:48 +00:00
David Baker
8184855d5a
add note about scope of rule_ids.
2015-02-04 16:30:57 +00:00
David Baker
dbbf9626b4
Fix various incorreect examples in the doc.
2015-02-04 11:34:32 +00:00
David Baker
f24e951b02
s/instance_handle/profile_tag/
2015-02-03 16:21:09 +00:00
David Baker
91d12dc955
Replace set_sound with more generic set_tweaks.
2015-02-03 15:38:12 +00:00
David Baker
8920d58cc4
Strongly recommend standard URI scheme for notification pokes.
2015-02-03 14:35:01 +00:00
David Baker
067e4bb777
Add docs for http notification poke protocol.
2015-02-03 14:21:56 +00:00
David Baker
1a5678786f
Doc deleting & getting rules.
2015-02-02 18:36:04 +00:00
David Baker
c40b97aaf5
Rule adding API with examples
2015-02-02 18:16:36 +00:00
David Baker
88178e376e
Oops, before is *more* important.
2015-02-02 17:26:58 +00:00
David Baker
0c79798f70
More WIP API docs and remove spurious line.
2015-02-02 17:10:09 +00:00
David Baker
b7a6e8f7b5
Finish non-API doc parts of push rules.
2015-02-02 16:25:53 +00:00
David Baker
f68fa8d6f8
Push rules c/s spec.
2015-02-02 15:14:45 +00:00
David Baker
c27fb8a262
Add WIP docs for the client-server bit of push.
2015-02-02 13:49:18 +00:00
David Baker
0a07d68818
Add overview on push.
2015-01-28 18:20:28 +00:00
Kegan Dougal
b01e8165d0
Update JSFiddles/how-to to support the new registration format.
2015-01-22 11:53:11 +00:00
Kegan Dougal
c19bced03d
Update jsfiddles to have more helpful error messages when there is no connection when logging in.
2015-01-22 11:53:11 +00:00
Kegan Dougal
07399b0966
Added demo.details
2015-01-22 11:53:11 +00:00
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.
2015-01-22 11:53:11 +00:00
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
2015-01-22 11:53:11 +00:00
Kegan Dougal
1f3811b1b8
Fix JSFiddles to work with the new C-S API.
2015-01-22 11:53:11 +00:00
Kegan Dougal
d5da30422c
Added final jsfiddle: an example app demonstrating most of the c2s api.
2015-01-22 11:53:11 +00:00
Kegan Dougal
eee7cd7730
Added more jsfiddles.
2015-01-22 11:53:11 +00:00
Kegan Dougal
8fb3367238
More fiddles, more fun!
2015-01-22 11:53:11 +00:00
Kegan Dougal
3dafe4133c
Added registration/login jsfiddle, formatted so it can be loaded directly from jsfiddle. Requires jQuery 1.8.3
2015-01-22 11:53:11 +00:00
Kegan Dougal
0e2a3a892f
Presence modifications from MatrixPresence notes.
...
- Idle is no longer a flag but a full state like online|offline.
- Clarify status examples.
- Add device ID to presence state API given it is per device.
- Add note on device specificity on event stream presence parameter.
- Add global appear-offline API.
2015-01-22 09:46:25 +00:00
Matthew Hodgson
9a9d4b15d2
Merge pull request #8 from matrix-org/spec-18
...
Add spec for m.notice (SPEC-18)
2015-01-21 18:29:16 +00:00
Paul "LeoNerd" Evans
a9a4c46a57
Add spec for m.notice (SPEC-18)
2015-01-21 18:26:27 +00:00
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".
2015-01-21 13:09:16 +00:00
