Commit Graph

257 Commits

Author SHA1 Message Date
Hubert Chathi 1be3bd602a add changelog 2018-11-05 15:41:41 -05:00
Travis Ralston 485928486a Client-server r0.4.0 changelog 2018-08-31 16:45:41 -06:00
Travis Ralston 17a6a4c2ee Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0 2018-08-31 16:45:09 -06:00
Travis Ralston bb2835651f
Merge pull request from turt2live/travis/c2s/clarify-errors
List known client-server error codes; Clarify priority of error codes vs http status code
2018-08-31 16:42:43 -06:00
Travis Ralston 680ab5e194 Misc formatting things
Consistency, make the renderer happy
2018-08-31 16:36:51 -06:00
Travis Ralston 247ae26ec4 Consistency 2018-08-31 16:33:17 -06:00
Travis Ralston d5af3bae43 This isn't a new endpoint 2018-08-31 16:33:09 -06:00
Travis Ralston 10fa5a3a01 Changelog for r0.1.0 IS spec 2018-08-31 16:21:51 -06:00
Travis Ralston 7d34995ece It's actually an "identity server implementing the Identity Service API"
Also add a note about appservices being special.
2018-08-31 15:35:32 -06:00
Travis Ralston 7ac76fa27c Actually we're going with "identity server" afterall 2018-08-31 15:04:00 -06:00
Travis Ralston cc0badaaa1 Fix all naming cases of "identity service"
Fixes https://github.com/matrix-org/matrix-doc/issues/1396

Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
2018-08-31 15:04:00 -06:00
Travis Ralston 683072e624
Merge pull request from turt2live/travis/c2s/id-server
Clean up and flesh out all three editions of the /requestToken API
2018-08-31 14:57:17 -06:00
Travis Ralston 108c623557
Merge pull request from turt2live/travis/c2s/read-markers
Add read markers
2018-08-31 14:47:39 -06:00
Travis Ralston e49ed5d1ec Changelog 2018-08-31 12:37:24 -06:00
Hubert Chathi c0dd7e0025
Merge pull request from Zil0/encrypted_attach
Document encrypted attachments
2018-08-31 13:33:05 -04:00
Travis Ralston 3146fc339a Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors 2018-08-31 11:15:03 -06:00
Travis Ralston 679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers 2018-08-31 10:34:19 -06:00
Travis Ralston 7f1b94c211 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server 2018-08-31 10:29:09 -06:00
Travis Ralston 9004be7bda Merge remote matrix-org/master 2018-08-31 10:08:05 -06:00
Travis Ralston 25778989a1
Merge pull request from turt2live/travis/c2s/sync-event-fields
Fix event schemas for /sync
2018-08-31 10:00:17 -06:00
Travis Ralston f72c821be4
Merge pull request from turt2live/travis/c2s/local-echo
Reference that transaction IDs may be used to echo
2018-08-31 09:48:02 -06:00
Travis Ralston 2e3e189ea2 Merge remote matrix-org/master 2018-08-31 09:31:39 -06:00
Travis Ralston 2e316ea80b
Merge pull request from matrix-org/application_service/release-r0.1.0
r0.1.0 for the Application Service specification
2018-08-31 09:12:47 -06:00
Travis Ralston 136ba15eb2
Merge pull request from turt2live/travis/c2s/clarify-html-again
Mention that clients should not be producing invalid HTML
2018-08-31 08:41:29 -06:00
Travis Ralston afa16f1e4e
Merge pull request from turt2live/travis/c2s/room-tags
Update the room tagging documentation
2018-08-31 08:36:40 -06:00
Travis Ralston c127eed7e7
Merge pull request from turt2live/travis/c2s/media-csp
Specify the minimum CSP for media
2018-08-31 08:32:33 -06:00
Travis Ralston 73736d41db
Merge pull request from turt2live/travis/c2s/user-directory
Clarify the homeserver's behaviour for user searching
2018-08-31 08:32:02 -06:00
Travis Ralston 9646d99c9e
Merge pull request from turt2live/travis/general/redactions
Add the other fields the server is expected to keep on events
2018-08-31 08:31:50 -06:00
Travis Ralston ac56e76746 Changelog 2018-08-30 23:09:37 -06:00
Travis Ralston 7f719b23e7
Merge pull request from turt2live/travis/c2s/inhibit-login
Document the inhibit_login registration option
2018-08-30 18:21:39 -06:00
Travis Ralston f3181bbedd Changelog 2018-08-30 18:20:50 -06:00
Travis Ralston 7516af3df2 Changelog 2018-08-30 16:22:56 -06:00
Travis Ralston 86c85aea71 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding 2018-08-30 15:23:50 -06:00
Travis Ralston cee0a5ac7b
Merge pull request from turt2live/travis/general/r0-prep
Prepare the identity service and server-server APIs for r0
2018-08-30 14:46:35 -06:00
Travis Ralston 4630c06721 Appservice r0.1.0 changelog 2018-08-30 13:36:43 -06:00
Travis Ralston 951b442956
Merge pull request from turt2live/travis/c2s/fix-events
Fix client-server event schemas: move `age`, dedupe fields
2018-08-30 13:36:02 -06:00
Travis Ralston 2d18b0d2d8 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again 2018-08-30 12:21:38 -06:00
Travis Ralston 49c5677969 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory 2018-08-30 12:18:35 -06:00
Travis Ralston 2753d24302 Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep 2018-08-30 12:17:09 -06:00
Travis Ralston 440841d1ff Recommend a CSP rather than require it. 2018-08-30 12:13:21 -06:00
Travis Ralston f04afaa9b9
Merge pull request from mujx/missing-enum-fields
Add missing enum fields for the set_presence parameter
2018-08-30 11:37:34 -06:00
Travis Ralston 827033c128 Merge remote matrix-org/master 2018-08-30 11:29:47 -06:00
Travis Ralston 0f2e01f5b5
Merge pull request from turt2live/travis/as/cleanup
Application service spec cleanup; Security definitions; r0 prep
2018-08-30 11:08:10 -06:00
Travis Ralston 7ecf2406eb
Merge pull request from turt2live/travis/c2s/403-put-state
Document 403 error for sending state events
2018-08-30 06:50:48 -06:00
Travis Ralston 3d99c8b5a8 Changelog 2018-08-29 23:19:18 -06:00
Travis Ralston 38bb222461 Changelog 2018-08-29 23:00:21 -06:00
Travis Ralston a5c3924492 Merge remote matrix-org/master 2018-08-29 21:28:24 -06:00
Hubert Chathi 4230e375fa
Merge pull request from Zil0/key_sharing
Document key sharing events
2018-08-29 23:05:17 -04:00
Hubert Chathi 0130620cc1
Merge pull request from uhoreg/e2e_sessions
specify how to handle multiple olm sessions with the same device
2018-08-29 22:45:38 -04:00
Travis Ralston e7a69a6a6d Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep 2018-08-29 19:29:42 -06:00