Commit Graph

  • da3dd40e06
    Merge pull request #1592 from matrix-org/erikj/spec_3pid_ruls Erik Johnston 2018-08-31 11:26:45 +0100
  • d91dc6fbf6 Fixup erikj/auth_events Erik Johnston 2018-08-31 11:20:26 +0100
  • 4d653748d6 Add note back in erikj/auth_rejections Erik Johnston 2018-08-31 11:17:58 +0100
  • 8e6c8ba59e Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls erikj/spec_3pid_ruls Erik Johnston 2018-08-31 11:13:13 +0100
  • a1aedb386a Actually use proper sentences like a proper adult Erik Johnston 2018-08-31 11:04:44 +0100
  • 0adfd1ebb0
    Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules Erik Johnston 2018-08-31 11:01:12 +0100
  • d63184ebac Fixup erikj/fixup_auth_rules Erik Johnston 2018-08-31 10:59:42 +0100
  • 3c53e1910d Fixup Erik Johnston 2018-08-31 10:51:59 +0100
  • 1a45bc4a85 Reword Erik Johnston 2018-08-31 10:24:51 +0100
  • 59f86ec8f2 Reindent as RST requires sublists to be three spaces Erik Johnston 2018-08-31 10:07:53 +0100
  • f4706c8889 Require creator field Erik Johnston 2018-08-31 10:06:26 +0100
  • f3aea32a24 Be consistent with 'If..., reject' Erik Johnston 2018-08-31 09:59:45 +0100
  • 6c8a45c165 Full stops Erik Johnston 2018-08-31 09:57:00 +0100
  • ebb044674f Remove duplicated explanation about event rejection Erik Johnston 2018-08-31 09:51:17 +0100
  • ac56e76746 Changelog Travis Ralston 2018-08-30 23:09:37 -0600
  • d57b40d0cc Clarify how the client should treat errors Travis Ralston 2018-08-30 23:06:32 -0600
  • e6adf9f6b9 Document known client-server error codes Travis Ralston 2018-08-30 23:05:51 -0600
  • 4bd23a9086 send_attempt is no longer optional Travis Ralston 2018-08-30 22:28:50 -0600
  • 7f719b23e7
    Merge pull request #1589 from turt2live/travis/c2s/inhibit-login Travis Ralston 2018-08-30 18:21:39 -0600
  • f3181bbedd Changelog Travis Ralston 2018-08-30 18:20:50 -0600
  • dfaed5b525 Clean up and flesh out all three editions of the /requestToken API Travis Ralston 2018-08-30 18:18:08 -0600
  • 2f55dd66da
    Merge pull request #1441 from matrix-org/erikj/state_res_msc Travis Ralston 2018-08-30 16:56:17 -0600
  • ce14779af1
    Merge pull request #1567 from turt2live/travis/c2s/3pid-binding Travis Ralston 2018-08-30 16:33:24 -0600
  • 5da3072eef Wording change ('may not' has a special meaning) Travis Ralston 2018-08-30 16:32:14 -0600
  • 4b7f308fc4
    Merge pull request #1576 from turt2live/travis/s2s/key-mgmt Travis Ralston 2018-08-30 16:30:57 -0600
  • 2a08a308f3 device_keys are required Travis Ralston 2018-08-30 16:29:24 -0600
  • caaa688e37 Fix links to client-server spec Travis Ralston 2018-08-30 16:28:26 -0600
  • 219b27b182 Merge remote matrix-org/master Travis Ralston 2018-08-30 16:27:20 -0600
  • 7516af3df2 Changelog Travis Ralston 2018-08-30 16:22:56 -0600
  • f923d08078 Add read markers Travis Ralston 2018-08-30 16:21:31 -0600
  • 492df88024
    Merge pull request #1622 from matrix-org/rav/clarify_event_signing Richard van der Hoff 2018-08-30 23:06:13 +0100
  • 0f84c69805
    Merge branch 'master' into rav/clarify_event_signing Richard van der Hoff 2018-08-30 22:48:56 +0100
  • 8bcd7d26e3 /3pid/delete returns an empty object Travis Ralston 2018-08-30 15:28:43 -0600
  • 390f1c16f7 Remove mentions of identity services from /3pid/delete Travis Ralston 2018-08-30 15:27:36 -0600
  • 86c85aea71 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding Travis Ralston 2018-08-30 15:23:50 -0600
  • 98a445890c Render a warning if the spec is unstable Travis Ralston 2018-08-30 13:25:01 -0600
  • d57b977a55 Merge branch 'm-master' into travis/general/3pid_invite Travis Ralston 2018-08-30 15:01:31 -0600
  • 1f6499d563 Fix typo Travis Ralston 2018-08-30 15:01:20 -0600
  • 356626845c Remove unhelpful arrow from the 3rd party invite sequence dance Travis Ralston 2018-08-30 15:00:52 -0600
  • 5e6a2c30a2 Comment out the part where identity services can revoke their keys Travis Ralston 2018-08-30 15:00:14 -0600
  • cee0a5ac7b
    Merge pull request #1557 from turt2live/travis/general/r0-prep Travis Ralston 2018-08-30 14:46:35 -0600
  • a1b1054aa1 fix handling of multi-line state key descriptions Hubert Chathi 2018-08-30 15:57:09 -0400
  • 4630c06721 Appservice r0.1.0 changelog application_service/r0.1.0 application_service/release-r0.1.0 Travis Ralston 2018-08-30 11:24:36 -0600
  • 951b442956
    Merge pull request #1558 from turt2live/travis/c2s/fix-events Travis Ralston 2018-08-30 13:36:02 -0600
  • 429f302744 Add an `age` to the invite room state example Travis Ralston 2018-08-30 13:32:53 -0600
  • 32cde24bcf Fix server-server link in IS spec Travis Ralston 2018-08-30 12:26:24 -0600
  • e82c22b060
    Merge pull request #1615 from turt2live/travis/is/touchups Travis Ralston 2018-08-30 12:23:25 -0600
  • b8f2c721dc Clarify which attributes should be valid Travis Ralston 2018-08-30 12:22:50 -0600
  • 2d18b0d2d8 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again Travis Ralston 2018-08-30 12:21:38 -0600
  • f09db16027 Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt Travis Ralston 2018-08-30 12:19:59 -0600
  • 49c5677969 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory Travis Ralston 2018-08-30 12:18:35 -0600
  • 2753d24302 Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep Travis Ralston 2018-08-30 12:17:09 -0600
  • 440841d1ff Recommend a CSP rather than require it. Travis Ralston 2018-08-30 12:13:21 -0600
  • 464f4f5f21 Correctly check for the 'core' folder Travis Ralston 2018-08-30 12:05:56 -0600
  • c8a8f13623 Don't check the underlying definitions Travis Ralston 2018-08-30 11:57:01 -0600
  • 31ea4279d1 Resolve references in the check_examples script Travis Ralston 2018-08-30 11:53:39 -0600
  • 6aacec3178 Fix power level JSON example Travis Ralston 2018-08-30 11:40:08 -0600
  • f04afaa9b9
    Merge pull request #780 from mujx/missing-enum-fields Travis Ralston 2018-08-30 11:37:34 -0600
  • 827033c128 Merge remote matrix-org/master Travis Ralston 2018-08-30 11:29:47 -0600
  • 138419cdd4
    fix indentation on release process doc Travis Ralston 2018-08-30 11:19:55 -0600
  • 70f72b5b3b
    Merge pull request #1628 from turt2live/travis/as/external_url Travis Ralston 2018-08-30 11:12:39 -0600
  • f649d04ae1
    Merge pull request #1626 from matrix-org/rav/encoding Richard van der Hoff 2018-08-30 18:11:38 +0100
  • cc1e496287
    Merge pull request #1629 from turt2live/travis/as/route-versions Travis Ralston 2018-08-30 11:11:25 -0600
  • 20c9829f56
    Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals Richard van der Hoff 2018-08-30 18:10:48 +0100
  • 326ff6b1a1
    Merge branch 'master' into travis/as/external_url Travis Ralston 2018-08-30 11:09:15 -0600
  • 0f2e01f5b5
    Merge pull request #1555 from turt2live/travis/as/cleanup Travis Ralston 2018-08-30 11:08:10 -0600
  • 1a3f112337 Clarify that the external_url is unsafe Travis Ralston 2018-08-30 11:07:09 -0600
  • be5c566028 Version all appservice endpoints and provide a fallback Travis Ralston 2018-08-30 11:03:42 -0600
  • a48f7b9278 Clarify how external_url is supposed to work Travis Ralston 2018-08-30 10:49:05 -0600
  • ecd3ce39e5 Don't generate proposals.rst in Circle CI Travis Ralston 2018-08-30 10:29:59 -0600
  • 05b017276c Don't accidentally limit application services to one homeserver Travis Ralston 2018-08-30 10:23:12 -0600
  • 4e90b32348 Set the encoding to UTF-8 on all file I/O Richard van der Hoff 2018-08-30 17:18:07 +0100
  • f1ae872857 light zebra striping for tables Ben Parsons 2018-08-30 17:16:45 +0100
  • ab14f33060 Add link to the client-server ACLs module Travis Ralston 2018-08-30 07:58:10 -0600
  • 5c2b8e3569 Explain how to handle rejeceted events Erik Johnston 2018-08-30 17:03:16 +0100
  • 9e1d6d7490 sanitise caption handling Ben Parsons 2018-08-30 17:01:27 +0100
  • db644ca522 add some clarifications Hubert Chathi 2018-08-30 11:24:39 -0400
  • 6b52e1df77
    Merge pull request #1587 from turt2live/travis/s2s/clarify-state-ids-inclusion Travis Ralston 2018-08-30 07:44:27 -0600
  • 56f6640c07
    Merge pull request #1618 from turt2live/travis/c2s/initalsync Travis Ralston 2018-08-30 07:44:08 -0600
  • 55c4307f12 Rewrite the section on signing events Richard van der Hoff 2018-08-30 14:37:24 +0100
  • 7ecf2406eb
    Merge pull request #1590 from turt2live/travis/c2s/403-put-state Travis Ralston 2018-08-30 06:50:48 -0600
  • 5c059a5e26 ISes use keys too Richard van der Hoff 2018-08-30 11:09:24 +0100
  • 6ba50fe2f6
    Merge pull request #1588 from matrix-org/rav/fix_server_name Richard van der Hoff 2018-08-30 10:48:06 +0100
  • 3d99c8b5a8 Changelog Travis Ralston 2018-08-29 23:19:18 -0600
  • bd93481013 Reference that transaction IDs may be used to echo Travis Ralston 2018-08-29 23:18:10 -0600
  • 78487a01ec Remove references to initialSync from account data and receipts module Travis Ralston 2018-08-29 23:11:00 -0600
  • 38bb222461 Changelog Travis Ralston 2018-08-29 23:00:21 -0600
  • e227095fb4 Add rich replies Travis Ralston 2018-08-29 17:42:44 -0600
  • b2092922e8 Don't define a variable for the appservice major version Travis Ralston 2018-08-29 21:51:26 -0600
  • a5c3924492 Merge remote matrix-org/master Travis Ralston 2018-08-29 21:28:24 -0600
  • fd7cb22a28 Fix event type example of m.forwarded_room_key Travis Ralston 2018-08-29 21:22:47 -0600
  • 4230e375fa
    Merge pull request #1465 from Zil0/key_sharing Hubert Chathi 2018-08-29 23:05:17 -0400
  • dc602b74d2 Reference the server-server specification for /onbind Travis Ralston 2018-08-29 21:01:49 -0600
  • 0387da51e2 Clarify how sessions work when establishing associations Travis Ralston 2018-08-29 21:01:28 -0600
  • 039cefdbea Say that identity services should be nice to web browsers (CORS/OPTIONS) Travis Ralston 2018-08-29 21:01:14 -0600
  • bbba7dedd6 Clean up identity service RST Travis Ralston 2018-08-29 21:00:47 -0600
  • f030d19f3c Clean up identity service swagger Travis Ralston 2018-08-29 20:57:41 -0600
  • 0130620cc1
    Merge pull request #1596 from uhoreg/e2e_sessions Hubert Chathi 2018-08-29 22:45:38 -0400
  • 9b94e588e6 document new state resolution algorithm Hubert Chathi 2018-08-29 21:39:49 -0400
  • c7a228bf7b Don't make the major version a variable Travis Ralston 2018-08-29 19:32:52 -0600