Erik Johnston
|
080845ac1c
|
Add link to previous section
|
2018-08-31 12:00:38 +01:00 |
|
Erik Johnston
|
bbca5ce43a
|
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events
|
2018-08-31 11:52:36 +01:00 |
|
Erik Johnston
|
b6ed25e4b4
|
Fix incorrect indent
|
2018-08-31 11:32:29 +01:00 |
|
Erik Johnston
|
f3a13eed76
|
Merge pull request #1593 from matrix-org/erikj/auth_events
Update rules on which events to add to `auth_events`
|
2018-08-31 11:27:03 +01:00 |
|
Erik Johnston
|
86891ca7e4
|
Merge pull request #1625 from matrix-org/erikj/auth_rejections
Explain how to handle rejected events
|
2018-08-31 11:26:57 +01:00 |
|
Erik Johnston
|
da3dd40e06
|
Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls
Spec third party invites in auth rules
|
2018-08-31 11:26:45 +01:00 |
|
Erik Johnston
|
d91dc6fbf6
|
Fixup
|
2018-08-31 11:20:26 +01:00 |
|
Erik Johnston
|
4d653748d6
|
Add note back in
|
2018-08-31 11:17:58 +01:00 |
|
Erik Johnston
|
8e6c8ba59e
|
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls
|
2018-08-31 11:13:13 +01:00 |
|
Erik Johnston
|
a1aedb386a
|
Actually use proper sentences like a proper adult
|
2018-08-31 11:04:49 +01:00 |
|
Erik Johnston
|
0adfd1ebb0
|
Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules
Fix up auth rules
|
2018-08-31 11:01:12 +01:00 |
|
Erik Johnston
|
d63184ebac
|
Fixup
|
2018-08-31 10:59:42 +01:00 |
|
Erik Johnston
|
3c53e1910d
|
Fixup
|
2018-08-31 10:51:59 +01:00 |
|
Erik Johnston
|
1a45bc4a85
|
Reword
|
2018-08-31 10:24:51 +01:00 |
|
Erik Johnston
|
59f86ec8f2
|
Reindent as RST requires sublists to be three spaces
|
2018-08-31 10:07:59 +01:00 |
|
Erik Johnston
|
f4706c8889
|
Require creator field
|
2018-08-31 10:06:26 +01:00 |
|
Erik Johnston
|
f3aea32a24
|
Be consistent with 'If..., reject'
|
2018-08-31 09:59:45 +01:00 |
|
Erik Johnston
|
6c8a45c165
|
Full stops
|
2018-08-31 09:57:00 +01:00 |
|
Erik Johnston
|
ebb044674f
|
Remove duplicated explanation about event rejection
|
2018-08-31 09:51:17 +01:00 |
|
Travis Ralston
|
7f719b23e7
|
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login
Document the inhibit_login registration option
|
2018-08-30 18:21:39 -06:00 |
|
Travis Ralston
|
2f55dd66da
|
Merge pull request #1441 from matrix-org/erikj/state_res_msc
State Resolution: Reloaded MSC
|
2018-08-30 16:56:17 -06:00 |
|
Travis Ralston
|
ce14779af1
|
Merge pull request #1567 from turt2live/travis/c2s/3pid-binding
Document `validated_at`, `added_at`, and POST /3pid/delete
|
2018-08-30 16:33:24 -06:00 |
|
Travis Ralston
|
5da3072eef
|
Wording change ('may not' has a special meaning)
|
2018-08-30 16:32:14 -06:00 |
|
Travis Ralston
|
4b7f308fc4
|
Merge pull request #1576 from turt2live/travis/s2s/key-mgmt
Add federation /user/keys/* endpoints
|
2018-08-30 16:30:57 -06:00 |
|
Travis Ralston
|
2a08a308f3
|
device_keys are required
|
2018-08-30 16:29:24 -06:00 |
|
Travis Ralston
|
caaa688e37
|
Fix links to client-server spec
|
2018-08-30 16:28:26 -06:00 |
|
Travis Ralston
|
219b27b182
|
Merge remote matrix-org/master
|
2018-08-30 16:27:20 -06:00 |
|
Richard van der Hoff
|
492df88024
|
Merge pull request #1622 from matrix-org/rav/clarify_event_signing
Rewrite the section on signing events
|
2018-08-30 23:06:13 +01:00 |
|
Richard van der Hoff
|
0f84c69805
|
Merge branch 'master' into rav/clarify_event_signing
|
2018-08-30 22:48:56 +01:00 |
|
Travis Ralston
|
8bcd7d26e3
|
/3pid/delete returns an empty object
|
2018-08-30 15:28:43 -06:00 |
|
Travis Ralston
|
390f1c16f7
|
Remove mentions of identity services from /3pid/delete
This will be covered by https://github.com/matrix-org/matrix-doc/issues/1194
For now, we can accept that homeservers may try to unbind, however clients should not rely on it.
|
2018-08-30 15:27:36 -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 #1557 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
|
951b442956
|
Merge pull request #1558 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
|
429f302744
|
Add an age to the invite room state example
|
2018-08-30 13:32:53 -06:00 |
|
Travis Ralston
|
32cde24bcf
|
Fix server-server link in IS spec
|
2018-08-30 12:26:24 -06:00 |
|
Travis Ralston
|
e82c22b060
|
Merge pull request #1615 from turt2live/travis/is/touchups
Touch up more of the identity service specification
|
2018-08-30 12:23:25 -06:00 |
|
Travis Ralston
|
f09db16027
|
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt
|
2018-08-30 12:19:59 -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
|
464f4f5f21
|
Correctly check for the 'core' folder
|
2018-08-30 12:05:56 -06:00 |
|
Travis Ralston
|
c8a8f13623
|
Don't check the underlying definitions
Otherwise the script will try to find a schema for our templates, which don't exist.
|
2018-08-30 11:57:01 -06:00 |
|
Travis Ralston
|
31ea4279d1
|
Resolve references in the check_examples script
|
2018-08-30 11:53:39 -06:00 |
|
Travis Ralston
|
6aacec3178
|
Fix power level JSON example
|
2018-08-30 11:40:08 -06:00 |
|
Travis Ralston
|
f04afaa9b9
|
Merge pull request #780 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
|
138419cdd4
|
fix indentation on release process doc
|
2018-08-30 11:19:55 -06:00 |
|
Travis Ralston
|
70f72b5b3b
|
Merge pull request #1628 from turt2live/travis/as/external_url
Clarify how external_url is supposed to work
|
2018-08-30 11:12:39 -06:00 |
|
Richard van der Hoff
|
f649d04ae1
|
Merge pull request #1626 from matrix-org/rav/encoding
Set the encoding to UTF-8 on all file I/O
|
2018-08-30 18:11:38 +01:00 |
|
Travis Ralston
|
cc1e496287
|
Merge pull request #1629 from turt2live/travis/as/route-versions
Version all appservice endpoints and provide a fallback
|
2018-08-30 11:11:25 -06:00 |
|
Richard van der Hoff
|
20c9829f56
|
Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals
Don't generate proposals.rst in Circle CI
|
2018-08-30 18:10:48 +01:00 |
|