d57b977a55
Merge branch 'm-master' into travis/general/3pid_invite
6 years ago
1f6499d563
Fix typo
6 years ago
356626845c
Remove unhelpful arrow from the 3rd party invite sequence dance
...
This doesn't add anything in terms of clarity.
6 years ago
5e6a2c30a2
Comment out the part where identity services can revoke their keys
...
They can't because otherwise 3rd party invites can be rejected by homeservers, as per https://github.com/matrix-org/matrix-doc/issues/1633
6 years ago
cee0a5ac7b
Merge pull request #1557 from turt2live/travis/general/r0-prep
...
Prepare the identity service and server-server APIs for r0
6 years ago
951b442956
Merge pull request #1558 from turt2live/travis/c2s/fix-events
...
Fix client-server event schemas: move `age`, dedupe fields
6 years ago
429f302744
Add an `age` to the invite room state example
6 years ago
32cde24bcf
Fix server-server link in IS spec
6 years ago
e82c22b060
Merge pull request #1615 from turt2live/travis/is/touchups
...
Touch up more of the identity service specification
6 years ago
2753d24302
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
6 years ago
464f4f5f21
Correctly check for the 'core' folder
6 years ago
c8a8f13623
Don't check the underlying definitions
...
Otherwise the script will try to find a schema for our templates, which don't exist.
6 years ago
31ea4279d1
Resolve references in the check_examples script
6 years ago
6aacec3178
Fix power level JSON example
6 years ago
f04afaa9b9
Merge pull request #780 from mujx/missing-enum-fields
...
Add missing enum fields for the set_presence parameter
6 years ago
827033c128
Merge remote matrix-org/master
6 years ago
138419cdd4
fix indentation on release process doc
6 years ago
70f72b5b3b
Merge pull request #1628 from turt2live/travis/as/external_url
...
Clarify how external_url is supposed to work
6 years ago
f649d04ae1
Merge pull request #1626 from matrix-org/rav/encoding
...
Set the encoding to UTF-8 on all file I/O
6 years ago
cc1e496287
Merge pull request #1629 from turt2live/travis/as/route-versions
...
Version all appservice endpoints and provide a fallback
6 years ago
20c9829f56
Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals
...
Don't generate proposals.rst in Circle CI
6 years ago
326ff6b1a1
Merge branch 'master' into travis/as/external_url
6 years ago
0f2e01f5b5
Merge pull request #1555 from turt2live/travis/as/cleanup
...
Application service spec cleanup; Security definitions; r0 prep
6 years ago
1a3f112337
Clarify that the external_url is unsafe
6 years ago
be5c566028
Version all appservice endpoints and provide a fallback
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1616
6 years ago
a48f7b9278
Clarify how external_url is supposed to work
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1624
6 years ago
ecd3ce39e5
Don't generate proposals.rst in Circle CI
6 years ago
05b017276c
Don't accidentally limit application services to one homeserver
6 years ago
4e90b32348
Set the encoding to UTF-8 on all file I/O
...
Hopefully this will resolve issues with building the spec on systems where the
default encoding is somthing other than UTF-8.
6 years ago
ab14f33060
Add link to the client-server ACLs module
6 years ago
6b52e1df77
Merge pull request #1587 from turt2live/travis/s2s/clarify-state-ids-inclusion
...
Clarify that the requested event is excluded from /state and /state_ids
6 years ago
56f6640c07
Merge pull request #1618 from turt2live/travis/c2s/initalsync
...
Remove references to initialSync from account data and receipts module
6 years ago
7ecf2406eb
Merge pull request #1590 from turt2live/travis/c2s/403-put-state
...
Document 403 error for sending state events
6 years ago
6ba50fe2f6
Merge pull request #1588 from matrix-org/rav/fix_server_name
...
Specify that server names cannot be %-encoded
6 years ago
78487a01ec
Remove references to initialSync from account data and receipts module
...
Fixes https://github.com/matrix-org/matrix-doc/issues/695
Note: This commit leaves the /join endpoints alone because they say "and /sync" rather than just initialSync
6 years ago
b2092922e8
Don't define a variable for the appservice major version
6 years ago
a5c3924492
Merge remote matrix-org/master
6 years ago
fd7cb22a28
Fix event type example of m.forwarded_room_key
6 years ago
4230e375fa
Merge pull request #1465 from Zil0/key_sharing
...
Document key sharing events
6 years ago
dc602b74d2
Reference the server-server specification for /onbind
6 years ago
0387da51e2
Clarify how sessions work when establishing associations
6 years ago
039cefdbea
Say that identity services should be nice to web browsers (CORS/OPTIONS)
6 years ago
bbba7dedd6
Clean up identity service RST
...
* Title casing
* s/identity server/identity service
* Rough column limit enforcement
* Add some links (used by future commits)
6 years ago
f030d19f3c
Clean up identity service swagger
...
* Add `consumes` (swagger)
* Remove `http` as a supported scheme (the spec specifically says clients MUST use https)
* Clarify various descriptions
* Full stops
* Additional wording
* s/older versions/previous drafts - we haven't had a release yet
* Indentation on examples
6 years ago
0130620cc1
Merge pull request #1596 from uhoreg/e2e_sessions
...
specify how to handle multiple olm sessions with the same device
6 years ago
c7a228bf7b
Don't make the major version a variable
...
We are likely to want to maintain v1 when we release a v2, so we'll avoid a variable for now.
6 years ago
e7a69a6a6d
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
6 years ago
a46783eb24
Revert "Take out the reference to the current version from the changelog"
...
This reverts commit 2a20c11467
6 years ago
4c9d672e1f
Merge pull request #1521 from matrix-org/push_gateway/r0.1.0_updates
...
r0.1.0 release of the Push Gateway specification
6 years ago
2a20c11467
Take out the reference to the current version from the changelog
6 years ago
Travis Ralston