Commit Graph

  • 9e82b18e24
    Merge pull request #1649 from matrix-org/matthew/to-device Matthew Hodgson 2018-09-01 03:09:41 +0100
  • 928fc5cbe5 incorporate review Matthew Hodgson 2018-09-01 03:08:53 +0100
  • 43f2819702 switch to travis' example matthew/to-device Matthew Hodgson 2018-09-01 03:06:15 +0100
  • 49f0a06238 experiment with additionalProperties some more Matthew Hodgson 2018-09-01 03:03:51 +0100
  • f6326030ba backtick asterisk Matthew Hodgson 2018-09-01 03:02:46 +0100
  • 7430c3b56f experiment with additionalProperties Matthew Hodgson 2018-09-01 03:01:41 +0100
  • 337041610f one slash? Matthew Hodgson 2018-09-01 02:53:15 +0100
  • b8608495e9 periods Matthew Hodgson 2018-09-01 02:51:24 +0100
  • a842e0433d try escaping the asterisk Matthew Hodgson 2018-09-01 02:50:32 +0100
  • 42b11e096f Review Matthew Hodgson 2018-09-01 02:48:37 +0100
  • d25f4412d4 improve wording Matthew Hodgson 2018-09-01 02:46:05 +0100
  • db302b66ca revert example which was corect first time; fix rst Matthew Hodgson 2018-09-01 02:44:53 +0100
  • 2c0b45fd14 fix example? Matthew Hodgson 2018-09-01 02:41:53 +0100
  • 0f9a23c471 swaggerify to-device Matthew Hodgson 2018-09-01 02:37:31 +0100
  • 0ee2cf6286 fix device_list_update example hopefully Matthew Hodgson 2018-09-01 02:14:36 +0100
  • 0afdcc59ea spell out stream_id and fix todo Matthew Hodgson 2018-09-01 02:10:45 +0100
  • d377bedd76 fix path Matthew Hodgson 2018-09-01 01:54:13 +0100
  • 30d56691b1 document device list synchronisation over federation. Matthew Hodgson 2018-09-01 01:47:55 +0100
  • d789564db7 only apply list CSS overrides to section classes Matthew Hodgson 2018-09-01 00:49:29 +0100
  • bd78445756 Merge branch 'travis/general/changelogs' into m-master Travis Ralston 2018-08-31 17:40:41 -0600
  • 735de03e07 Add r0 version links Travis Ralston 2018-08-31 17:40:32 -0600
  • 3ba64f95e6
    Merge pull request #1647 from matrix-org/client_server/release-r0.4.0 Travis Ralston 2018-08-31 17:07:38 -0600
  • 485928486a Client-server r0.4.0 changelog client_server/r0.4.0 client_server/release-r0.4.0 Travis Ralston 2018-08-31 16:45:41 -0600
  • 17a6a4c2ee Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0 Travis Ralston 2018-08-31 16:45:09 -0600
  • bb2835651f
    Merge pull request #1637 from turt2live/travis/c2s/clarify-errors Travis Ralston 2018-08-31 16:42:43 -0600
  • 51883562b9
    Merge pull request #1645 from matrix-org/identity_service/release-r0.1.0 Travis Ralston 2018-08-31 16:41:00 -0600
  • 680ab5e194 Misc formatting things Travis Ralston 2018-08-31 16:36:51 -0600
  • 247ae26ec4 Consistency Travis Ralston 2018-08-31 16:33:17 -0600
  • d5af3bae43 This isn't a new endpoint Travis Ralston 2018-08-31 16:33:09 -0600
  • 10fa5a3a01 Changelog for r0.1.0 IS spec identity_service/r0.1.0 identity_service/release-r0.1.0 Travis Ralston 2018-08-31 16:21:51 -0600
  • 00578547c0
    Merge pull request #1644 from matrix-org/rav/is_token_grammar Travis Ralston 2018-08-31 16:05:23 -0600
  • 30737cce96
    Merge pull request #1643 from turt2live/travis/sanity/fix-naming Travis Ralston 2018-08-31 15:56:17 -0600
  • f3825c5827 A couple more stragglers Travis Ralston 2018-08-31 15:55:07 -0600
  • 218b86d6e8 Hopefully the last one Travis Ralston 2018-08-31 15:48:41 -0600
  • 79974b152c s/identity service/identity server Richard van der Hoff 2018-08-31 22:44:36 +0100
  • 2af09655ce Fix the stragglers Travis Ralston 2018-08-31 15:44:23 -0600
  • 21f8898cd8 Merge remote-tracking branch 'origin/master' into rav/is_token_grammar Richard van der Hoff 2018-08-31 22:38:04 +0100
  • a544b68298 Merge branch 'master' into rav/is_token_grammar Richard van der Hoff 2018-08-31 22:37:04 +0100
  • 7d34995ece It's actually an "identity server implementing the Identity Service API" Travis Ralston 2018-08-31 15:35:32 -0600
  • c94f3619b7 Missed a rogue case of identity server Travis Ralston 2018-08-31 15:09:18 -0600
  • 7ac76fa27c Actually we're going with "identity server" afterall Travis Ralston 2018-08-31 15:03:48 -0600
  • ec248b436f Identity Service is lowercase Travis Ralston 2018-08-31 14:47:06 -0600
  • cc0badaaa1 Fix all naming cases of "identity service" Travis Ralston 2018-08-30 18:19:35 -0600
  • 683072e624
    Merge pull request #1636 from turt2live/travis/c2s/id-server Travis Ralston 2018-08-31 14:57:17 -0600
  • a1f655e5be Fix more error wording Travis Ralston 2018-08-31 14:53:59 -0600
  • 108c623557
    Merge pull request #1635 from turt2live/travis/c2s/read-markers Travis Ralston 2018-08-31 14:47:39 -0600
  • 8773b9319b
    Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier Richard van der Hoff 2018-08-31 21:40:55 +0100
  • 84a2b7f3c0
    Merge pull request #1632 from uhoreg/fix_room_member_state_key Travis Ralston 2018-08-31 14:38:58 -0600
  • 1261da209d Fix wording for the homeserver not allowing a particular 3pid Travis Ralston 2018-08-31 14:38:22 -0600
  • dfe6d0d3b8
    Merge pull request #1642 from turt2live/travis/c2s/pagination Travis Ralston 2018-08-31 14:23:31 -0600
  • 835f5de387 Generalize the token name even more Travis Ralston 2018-08-31 14:22:07 -0600
  • cb1e687196 spec the format of an IS invite token Richard van der Hoff 2018-08-31 21:16:32 +0100
  • 69c30ef156 spec the format of a client_secret Richard van der Hoff 2018-08-31 21:11:11 +0100
  • dced3d5707 Notes on the format of IS session IDs and tokens Richard van der Hoff 2018-08-31 21:03:15 +0100
  • f299fe023a English Travis Ralston 2018-08-31 12:51:31 -0600
  • e49ed5d1ec Changelog Travis Ralston 2018-08-31 12:37:24 -0600
  • f4c5c209f3 Generalize language for pagination Travis Ralston 2018-08-31 12:36:08 -0600
  • 824ce22caa Add additional clarity to the requestToken errors Travis Ralston 2018-08-31 11:41:46 -0600
  • 5bb7eca8e8 English Travis Ralston 2018-08-31 11:31:03 -0600
  • c0dd7e0025
    Merge pull request #1420 from Zil0/encrypted_attach Hubert Chathi 2018-08-31 13:33:05 -0400
  • 60dd9231e0 Don't explain how the IS might accept a 3pid Travis Ralston 2018-08-31 11:26:28 -0600
  • 63fdd72f73 Fix error description on /account/3pid/email/requestToken Travis Ralston 2018-08-31 11:24:35 -0600
  • 25a461b86e
    Merge pull request #1617 from turt2live/travis/c2s/rich-replies Travis Ralston 2018-08-31 11:21:34 -0600
  • 4b9fb99644 Take out unhelpful example Travis Ralston 2018-08-31 11:18:54 -0600
  • 3146fc339a Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors Travis Ralston 2018-08-31 11:15:03 -0600
  • f6d9e53f5c Clarify that homeserver must reject clients from setting m.fully_read Travis Ralston 2018-08-31 11:13:32 -0600
  • 2e8151999e Clarify that read markers are fully read markers Travis Ralston 2018-08-31 11:13:19 -0600
  • f1f32d3a15 add more clarifications Hubert Chathi 2018-08-31 12:59:57 -0400
  • 679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers Travis Ralston 2018-08-31 10:34:19 -0600
  • a4c2b2b905 General clarity and spelling for the requestToken APIs Travis Ralston 2018-08-31 10:32:30 -0600
  • 7f1b94c211 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server Travis Ralston 2018-08-31 10:29:09 -0600
  • 567843e043 Add additional clarity to how rich replies are structured and used Travis Ralston 2018-08-31 10:20:26 -0600
  • e3daf10bb9 refactor encrypted file schema as "Extension to m.message" Hubert Chathi 2018-08-31 12:11:27 -0400
  • 9004be7bda Merge remote matrix-org/master Travis Ralston 2018-08-31 10:08:05 -0600
  • 25778989a1
    Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields Travis Ralston 2018-08-31 10:00:17 -0600
  • f013b7ef03
    Merge pull request #1631 from turt2live/travis/general/unstable-warning Travis Ralston 2018-08-31 09:50:37 -0600
  • ab00630ebc Don't include a second unstable warning in the s2s spec for now Travis Ralston 2018-08-31 09:49:24 -0600
  • f72c821be4
    Merge pull request #1619 from turt2live/travis/c2s/local-echo Travis Ralston 2018-08-31 09:48:02 -0600
  • e3ad253dca A sender is also required for the invite_state Travis Ralston 2018-08-31 09:44:29 -0600
  • 2f824df8dd Define the real event types on the invite_state Travis Ralston 2018-08-31 09:43:29 -0600
  • fc037b3a72 Fix merge Travis Ralston 2018-08-31 09:33:30 -0600
  • 2e3e189ea2 Merge remote matrix-org/master Travis Ralston 2018-08-31 09:31:39 -0600
  • 2e316ea80b
    Merge pull request #1630 from matrix-org/application_service/release-r0.1.0 Travis Ralston 2018-08-31 09:12:47 -0600
  • 6a035cca63 Title casing Erik Johnston 2018-08-31 16:08:13 +0100
  • 1b366b163f Initial stab at documenting soft fail Erik Johnston 2018-08-31 16:01:17 +0100
  • 136ba15eb2
    Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again Travis Ralston 2018-08-31 08:41:29 -0600
  • 38ae166e9d
    Merge pull request #1505 from turt2live/travis/general/3pid_invite Travis Ralston 2018-08-31 08:38:40 -0600
  • afa16f1e4e
    Merge pull request #1606 from turt2live/travis/c2s/room-tags Travis Ralston 2018-08-31 08:36:40 -0600
  • c127eed7e7
    Merge pull request #1600 from turt2live/travis/c2s/media-csp Travis Ralston 2018-08-31 08:32:33 -0600
  • 73736d41db
    Merge pull request #1569 from turt2live/travis/c2s/user-directory Travis Ralston 2018-08-31 08:32:02 -0600
  • 9646d99c9e
    Merge pull request #1602 from turt2live/travis/general/redactions Travis Ralston 2018-08-31 08:31:50 -0600
  • c77b505441 capitali[zs]e path parameters Ben Parsons 2018-08-31 14:37:47 +0100
  • 778fe2a47a css caption size tweak Ben Parsons 2018-08-31 14:29:46 +0100
  • e8afab1fe5 many visual improvements Ben Parsons 2018-08-31 13:55:27 +0100
  • 6235c2e720
    Merge pull request #1594 from matrix-org/erikj/limit_auth_events Erik Johnston 2018-08-31 13:05:04 +0100
  • 080845ac1c Add link to previous section erikj/limit_auth_events Erik Johnston 2018-08-31 11:53:21 +0100
  • bbca5ce43a Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events Erik Johnston 2018-08-31 11:52:36 +0100
  • b6ed25e4b4 Fix incorrect indent Erik Johnston 2018-08-31 11:32:29 +0100
  • f3a13eed76
    Merge pull request #1593 from matrix-org/erikj/auth_events Erik Johnston 2018-08-31 11:27:03 +0100
  • 86891ca7e4
    Merge pull request #1625 from matrix-org/erikj/auth_rejections Erik Johnston 2018-08-31 11:26:57 +0100