0
0
Fork 0

Commit Graph

  • 45b1d08c7e SPEC-207: Add a warning about needing AS tokens to be unique and why Kegan Dougal 2015-10-14 15:16:12 +0100
  • cd34d4e19b SPEC-182: Make it clearer how ASes are supposed to create users by linkifying the right text. Kegan Dougal 2015-10-14 15:12:15 +0100
  • 392a1c5ad8 Another title Erik Johnston 2015-10-14 15:06:16 +0100
  • ca9e44baac Moar titles Erik Johnston 2015-10-14 15:01:21 +0100
  • a7332c8684 Merge pull request #98 from matrix-org/rav/speculator-readme Richard van der Hoff 2015-10-14 14:46:20 +0100
  • 3608f3a282 SPEC-144 : Use https examples not http. Kegan Dougal 2015-10-14 14:44:09 +0100
  • 013b6db895 Add a note on building the speculator Richard van der Hoff 2015-10-14 14:42:52 +0100
  • a7a5cb088b Add titles Erik Johnston 2015-10-14 14:35:08 +0100
  • f02c33738f Merge pull request #97 from matrix-org/rav/speculator Richard van der Hoff 2015-10-14 14:34:05 +0100
  • 270e1d7aa8 Add richvdh to list of trusted pushers for spectulator Richard van der Hoff 2015-10-14 14:29:36 +0100
  • e42c8b5b63 Add search API Erik Johnston 2015-10-14 14:19:11 +0100
  • 4a9db39277 Clean up some untruths in the login api doc Richard van der Hoff 2015-10-14 13:38:28 +0100
  • 34bd8edec5 Move related auth sections together Kegan Dougal 2015-10-14 13:26:58 +0100
  • 6f6861a11d Swaggerify the createRoom API Kegan Dougal 2015-10-14 13:17:51 +0100
  • 41fb0645a9 Add message pagination API Kegan Dougal 2015-10-14 11:16:58 +0100
  • 07d7a3fa3a Shuffle pagination section around Kegan Dougal 2015-10-14 11:03:53 +0100
  • 7bdb71b1c9 Tweak the syncing section Kegan Dougal 2015-10-14 10:25:39 +0100
  • e716e81963 Add `dir` parameter to pagination. Remove path references Kegan Dougal 2015-10-14 09:58:03 +0100
  • e561a663d3 Tweaks to intro, start using swagger APIs in the CS API section. Kegan Dougal 2015-10-13 16:53:27 +0100
  • ee3fe989ca Linkify Kegsay 2015-10-13 15:47:56 +0100
  • 87f656ee0a Merge branch 'human-id-rules' of github.com:matrix-org/matrix-doc into human-id-rules Kegan Dougal 2015-10-13 15:19:27 +0100
  • c9f6534d84 Merge branch 'master' into human-id-rules Kegan Dougal 2015-10-13 15:16:41 +0100
  • 0ab2d66ae2 Make it valid RST Kegsay 2015-10-13 15:11:17 +0100
  • 3d5ec5eb15 Updated to reflect more recent progress Kegan Dougal 2015-10-13 15:09:00 +0100
  • 4170dbd5cf Review comments Kegan Dougal 2015-10-13 11:29:54 +0100
  • 173d00cea0 Review comments Kegan Dougal 2015-10-13 11:08:19 +0100
  • 1cfe4f784f special css for spec/howto Oddvar Lovaas 2015-10-12 19:57:41 +0100
  • ceebf34fca generate docs with new nav bar Oddvar Lovaas 2015-10-12 19:11:35 +0100
  • 98f225a974 Merge pull request #90 from matrix-org/daniel/speculator Daniel Wagner-Hall 2015-10-12 18:19:55 +0100
  • c48abd93b9 Merge pull request #41 from matrix-org/daniel/threepidinvites-2 Daniel Wagner-Hall 2015-10-12 18:11:52 +0100
  • 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 Daniel Wagner-Hall 2015-10-12 18:11:01 +0100
  • 4a1fb74897 Review comments Daniel Wagner-Hall 2015-10-12 18:08:51 +0100
  • 616f3990aa Merge pull request #87 from matrix-org/module-push Kegsay 2015-10-12 17:51:44 +0100
  • 8f5c796884 Linkify 'pushers' Kegan Dougal 2015-10-12 17:50:46 +0100
  • 89426c9322 typos and fixes Oddvar Lovaas 2015-10-09 17:43:46 +0100
  • e378de8379 Shuffle history visibility module to be in the module format Kegan Dougal 2015-10-09 11:04:11 +0100
  • 6922850643 Add missing return Daniel Wagner-Hall 2015-10-09 11:02:27 +0100
  • b46f0e30b8 Checkout SHA of origin/master rather than merging Daniel Wagner-Hall 2015-10-09 10:59:26 +0100
  • 481298db83 Revert "Checkout SHA of origin/master rather than merging" Daniel Wagner-Hall 2015-10-09 11:01:35 +0100
  • 0dbc6d8277 Checkout SHA of origin/master rather than merging Daniel Wagner-Hall 2015-10-09 10:59:26 +0100
  • b7e98a263a Merge pull request #89 from matrix-org/daniel/speculator Daniel Wagner-Hall 2015-10-09 10:48:24 +0100
  • a0cf485919 speculator: Specify merge target Daniel Wagner-Hall 2015-10-09 10:43:27 +0100
  • d6bdde4cee Merge pull request #88 from matrix-org/markjh/initial_sync_archived_flag Mark Haines 2015-10-09 10:28:40 +0100
  • 51ab51ae26 Only documents in matrix-doc! Oddvar Lovaas 2015-10-08 19:27:08 +0100
  • d42c3195e6 Use 'true' rather than '1' for archived flag Mark Haines 2015-10-08 18:06:52 +0100
  • 241096dc81 Add a flag to initial sync to indicate we want rooms that the user has left Mark Haines 2015-10-08 17:25:38 +0100
  • 213cb25290 Wrap correctly Kegan Dougal 2015-10-08 16:38:41 +0100
  • f2a6950cc3 Minor tweaks; allow objects without props/parents if a title is set Kegan Dougal 2015-10-08 16:21:26 +0100
  • dc3c02aff5 Review comments Daniel Wagner-Hall 2015-10-08 10:08:38 -0500
  • 21a40b317d Merge branch 'master' into daniel/threepidinvites-2 Daniel Wagner-Hall 2015-10-08 09:41:17 -0500
  • 9c95ee5c1f Modify wording and formatting Kegan Dougal 2015-10-08 15:36:03 +0100
  • befa23624e It's dangerous to go alone, take this. Kegan Dougal 2015-10-08 13:41:47 +0100
  • 65504db7bb Display nested keys on arrays of objects. Make it valid swagger. Kegan Dougal 2015-10-08 13:40:21 +0100
  • 31ae4b3859 Swaggerify push notification API Kegan Dougal 2015-10-08 13:08:21 +0100
  • a9618a981b Swaggerify the /enabled endpoint Kegan Dougal 2015-10-08 11:16:42 +0100
  • 56ce432399 Get profile tag keys displaying correctly. Kegan Dougal 2015-10-08 10:14:05 +0100
  • f6da9d7760 Give valid swagger. Split out rule/ruleset to separate definitions. Kegan Dougal 2015-10-08 09:57:40 +0100
  • 2ab9372b16 new nav bar. todo: get animation working. Oddvar Lovaas 2015-10-07 18:05:50 +0100
  • db25276856 Start adding in push definitions Kegan Dougal 2015-10-07 17:44:05 +0100
  • 9540069acd Use valid JSON Kegan Dougal 2015-10-07 16:06:11 +0100
  • c5edc60c4c Add push YAML for pushers endpoint. Kegan Dougal 2015-10-07 16:01:36 +0100
  • d3ed517ebf Finish laying out rough sections Kegan Dougal 2015-10-07 14:14:15 +0100
  • a7400508c6 Define module titles from the template Kegan Dougal 2015-10-07 14:07:36 +0100
  • 319ba8f404 Combine push files into one Kegan Dougal 2015-10-07 14:00:16 +0100
  • 91ca36509b Flesh out IM module Kegan Dougal 2015-10-07 11:51:49 +0100
  • c47fb12aed Merge branch 'master' into module-im Kegan Dougal 2015-10-07 10:48:52 +0100
  • a320d58948 Merge pull request #84 from matrix-org/markjh/v2_sync_templating Kegsay 2015-10-07 10:47:56 +0100
  • 656bee78c4 Merge branch 'master' into module-im Kegan Dougal 2015-10-07 10:46:39 +0100
  • 7805ca87df If build.py throws, actually print stdout. Also run jenkins.sh in verbose mode. Kegan Dougal 2015-10-07 10:34:29 +0100
  • dffe9b3e4c more questions Matthew Hodgson 2015-10-06 21:33:32 -0500
  • 91fb2ae723 edit oddvar's FAQ entries and add a bunch more questions Matthew Hodgson 2015-10-06 16:38:29 -0500
  • 85c035bd82 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc Matthew Hodgson 2015-10-06 14:50:57 -0500
  • ed9028f0fc merge again... Matthew Hodgson 2015-10-06 14:46:13 -0500
  • 2621c22956 fix barefaced lie regarding the passivity of ASes Matthew Hodgson 2015-10-06 13:36:59 -0500
  • f62fa6b980 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc Matthew Hodgson 2015-10-06 14:42:17 -0500
  • 10f3e7e84f Merge branch 'master' of github.com:matrix-org/matrix-doc Oddvar Lovaas 2015-10-06 20:23:42 +0100
  • 6e6585cebc FAQ draft Oddvar Lovaas 2015-10-06 20:21:49 +0100
  • f759dc30d2 major refresh of the existing FAQ content (WIP) Matthew Hodgson 2015-10-06 14:13:15 -0500
  • 7ae2573113 fix barefaced lie regarding the passivity of ASes Matthew Hodgson 2015-10-06 13:36:59 -0500
  • 034241eb20 Missing symlink for the v2 swagger APIs Mark Haines 2015-10-06 17:43:04 +0100
  • 509d178d58 Fix the receipts API to be valid swagger Mark Haines 2015-10-06 17:40:28 +0100
  • 4f606cf3a7 Add the fields required by the templating system to v2 sync Mark Haines 2015-10-06 17:31:05 +0100
  • 5a5a6565ff Merge pull request #68 from matrix-org/markjh/v2_sync_api Mark Haines 2015-10-06 16:51:06 +0100
  • 39faccb00d CS API is not just v1 surely Matthew Hodgson 2015-10-06 09:38:46 -0500
  • 0ce533d153 Split the room_map into separate sections based on whether they are "joined/invited/archived". Mark Haines 2015-10-06 13:42:03 +0100
  • 0e5b00feaa Fix event type in v2 sync example Mark Haines 2015-10-05 16:10:25 +0100
  • bbb5fa9398 Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events Mark Haines 2015-10-05 15:36:01 +0100
  • a7b808c5cd Add a invite_state key for holding the state that is bundled with an invite. This is kept separate from the actual state for the room as it may be derived from an incomplete, unverified copy of the state that was bundled with an invite event received over federation. Mark Haines 2015-10-05 15:26:33 +0100
  • ed0f6d3ff3 Typo Mark Haines 2015-10-05 14:22:50 +0100
  • 97cdd8106c s|client/api/v2_alpha|/client/v2_alpha| Mark Haines 2015-10-05 14:21:16 +0100
  • 8e5c832ff9 Flesh out more of the IM module Kegan Dougal 2015-10-05 13:45:23 +0100
  • 47cf958b54 Merge branch 'master' into module-im Kegan Dougal 2015-10-05 10:16:44 +0100
  • 99ca68ba6d Merge pull request #71 from matrix-org/erikj/disable_federation Erik Johnston 2015-10-05 09:19:17 +0100
  • 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation Erik Johnston 2015-10-05 09:17:28 +0100
  • db660d705a Merge branch 'release-0.2.0' Kegan Dougal 2015-10-02 16:44:16 +0100
  • 28fd1aa205 Go into a bit more detail about feature profiles Kegan Dougal 2015-10-02 16:34:06 +0100
  • 2fbf851a75 Merge branch 'master' into release-0.2.0 Kegan Dougal 2015-10-02 16:25:23 +0100
  • 8c092e3d11 Merge pull request #74 from matrix-org/module-presence Kegsay 2015-10-02 16:24:53 +0100
  • 417c5b53c4 Remove duplicate sentences from merge conflicts Kegan Dougal 2015-10-02 16:24:33 +0100
  • 047419f2ad Remove the room_id since it is redundent. Remove text about invite event handling till we've thought about it some more. Mark Haines 2015-10-02 16:21:48 +0100