Commit Graph

  • c959ca689c Explain what the room member states mean Daniel Wagner-Hall 2015-12-21 14:51:49 +0000
  • 25f49d851a Delete old drafts Daniel Wagner-Hall 2015-12-21 14:26:50 +0000
  • f5f90b6948 Merge pull request #237 from matrix-org/daniel/3pid Daniel Wagner-Hall 2015-12-21 13:40:10 +0100
  • 116253b2f5 Document the /event/:event_id/ federation endpoint Paul "LeoNerd" Evans 2015-12-17 20:45:57 +0000
  • 9bfe86f474 Add display_name to 3pid invites in m.room.member Daniel Wagner-Hall 2015-12-17 19:01:20 +0100
  • 20c7af3186 Merge pull request #236 from matrix-org/rav/search_spec_fixes Richard van der Hoff 2015-12-17 14:12:49 +0000
  • e4dd346a81 Restore 'client behaviour' section Richard van der Hoff 2015-12-17 14:07:35 +0000
  • b7c255a887 Tweaks/clarifications to search spec Richard van der Hoff 2015-12-17 13:40:22 +0000
  • 34bab312d3 Merge pull request #231 from matrix-org/daniel/oldversions Daniel Wagner-Hall 2015-12-17 11:24:28 +0100
  • b6cd3adc2f Merge pull request #233 from matrix-org/daniel/txnid Daniel Wagner-Hall 2015-12-17 11:24:07 +0100
  • b9bee6ee73 Initial hack at some federation /backfill documentation Paul "LeoNerd" Evans 2015-12-14 20:00:49 +0000
  • 2e7b3052c2 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc Matthew Hodgson 2015-12-14 08:40:47 +0000
  • f8f76794a3 fix random whitespace bug Matthew Hodgson 2015-12-14 08:40:41 +0000
  • b88158a193 Merge pull request #235 from Xe/master Daniel Wagner-Hall 2015-12-11 16:11:41 +0000
  • 7090e491de fix a typo in the example json for the old sync description Christine Dodrill 2015-12-11 08:10:29 -0800
  • 7980e65502 Merge pull request #234 from matrix-org/erikj/search_yet_agian Erik Johnston 2015-12-11 12:47:47 +0000
  • 88b350ca8b Better wording erikj/search_yet_agian Erik Johnston 2015-12-11 11:41:51 +0000
  • a2082e4b38 Note that count is approximate Erik Johnston 2015-12-11 10:53:22 +0000
  • dbba737135 Explain scope of uniqueness of txnid Daniel Wagner-Hall 2015-12-10 15:47:27 +0000
  • 3e086909f1 Deprecated deprecated APIs Daniel Wagner-Hall 2015-12-10 14:47:14 +0000
  • 678dbbe08a s/-/_/ r0.0.0 Daniel Wagner-Hall 2015-12-09 17:17:45 +0000
  • 7f87760655 Add links to old releases Daniel Wagner-Hall 2015-12-09 16:45:56 +0000
  • a767ce608c Merge pull request #230 from matrix-org/daniel/introfirst Daniel Wagner-Hall 2015-12-09 16:44:31 +0000
  • 8d184570a8 Mention intro before specs Daniel Wagner-Hall 2015-12-09 16:40:47 +0000
  • 997f3303f3 Revert "Add links to old releases" Daniel Wagner-Hall 2015-12-09 16:38:40 +0000
  • de12870791 Add links to old releases Daniel Wagner-Hall 2015-12-09 16:32:36 +0000
  • 53a21fc0b6 Note why we're not versioning index and intro Daniel Wagner-Hall 2015-12-09 16:29:11 +0000
  • 5080e8c079 Merge pull request #229 from matrix-org/daniel/indexpage Daniel Wagner-Hall 2015-12-09 16:24:58 +0000
  • 8eb84612f2 Add index page Daniel Wagner-Hall 2015-12-09 16:17:58 +0000
  • aaeaa1dd98 Detect major version in presence of patch release Daniel Wagner-Hall 2015-12-09 15:56:58 +0000
  • ad7874a730 Use site-relative stylesheet Daniel Wagner-Hall 2015-12-09 14:35:25 +0000
  • 77cfd9656c Merge pull request #228 from matrix-org/daniel/listfiles Daniel Wagner-Hall 2015-12-09 14:28:46 +0000
  • 59c134183e Merge de966e169f into e407425430 Richard van der Hoff 2015-12-09 14:15:43 +0000
  • e407425430 Fix warning block in e2e module Richard van der Hoff 2015-12-09 14:15:24 +0000
  • a484f04b33 Merge pull request #221 from matrix-org/daniel/pushaway Daniel Wagner-Hall 2015-12-09 14:04:02 +0000
  • 60127de1e3 Take list of files to edit as args Daniel Wagner-Hall 2015-12-09 13:50:15 +0000
  • a33e49fd1e Merge pull request #224 from matrix-org/markjh/filter_inline Mark Haines 2015-12-09 11:53:43 +0000
  • de966e169f Make ReST a bit more readable by uninlining long links Richard van der Hoff 2015-12-09 11:36:45 +0000
  • 0aa2b4c2c5 Add a citation for the group ratchet algorithm Richard van der Hoff 2015-12-09 11:31:27 +0000
  • c3a1318886 Make it explicit that the JSON filter object is passed as a string markjh/filter_inline Mark Haines 2015-12-09 10:50:02 +0000
  • bca3add9a7 Formatting Kegan Dougal 2015-12-08 16:38:48 +0000
  • d01ff6b495 Add noddy push gateway placeholder Kegan Dougal 2015-12-08 16:37:51 +0000
  • d83f44ee08 Merge pull request #226 from matrix-org/rav/more_e2e_docs Richard van der Hoff 2015-12-08 16:31:11 +0000
  • f22adad02e Merge pull request #225 from matrix-org/daniel/links Daniel Wagner-Hall 2015-12-08 16:19:17 +0000
  • 519013d367 EOL mailman Matthew Hodgson 2015-12-08 16:14:25 +0000
  • c96848d1bc Merge pull request #169 from matrix-org/erikj/search_yet_agian Erik Johnston 2015-12-08 16:11:03 +0000
  • 95255bcdf5 Use rst not html Erik Johnston 2015-12-08 16:02:55 +0000
  • 7b63c042fb Merge pull request #222 from matrix-org/daniel/removessmention Daniel Wagner-Hall 2015-12-08 15:42:44 +0000
  • 4be078440d Don't mention server-server stuff in client-server spec Daniel Wagner-Hall 2015-12-08 15:42:37 +0000
  • a9b4f6fef0 Add missing _ to paths Daniel Wagner-Hall 2015-12-08 15:39:32 +0000
  • e1fda6b6b6 Remove double the Erik Johnston 2015-12-08 15:35:59 +0000
  • 9c98c80bde Fix up filter description Erik Johnston 2015-12-08 14:32:01 +0000
  • c4085b0475 Merge pull request #139 from matrix-org/erikj/event_context_api Erik Johnston 2015-12-08 15:24:57 +0000
  • 141af817a7 More clarifications and updates to the draft e2e spec Richard van der Hoff 2015-12-08 15:05:15 +0000
  • eb9b154c54 Merge remote-tracking branch 'origin/master' into drafts/e2e Richard van der Hoff 2015-12-08 15:07:42 +0000
  • fd3dde5e88 Add link to speculator Daniel Wagner-Hall 2015-12-08 14:42:10 +0000
  • ed70bcb180 Add a rationale for allowing both inline filters and passing filters by id. Mark Haines 2015-12-08 14:36:50 +0000
  • 878ce2f206 Allow the filter JSON to be passed inline in the /sync request Mark Haines 2015-12-08 14:32:11 +0000
  • bcebcc61ef Merge pull request #223 from matrix-org/paul/federation-room-join Paul Evans 2015-12-08 14:12:32 +0000
  • 6025569a73 Remove unused 403 stub erikj/event_context_api Erik Johnston 2015-12-08 14:10:45 +0000
  • 0fb88e26f0 Add tags Erik Johnston 2015-12-08 14:07:08 +0000
  • 4290882034 Remove superfluous quote Erik Johnston 2015-12-08 14:06:59 +0000
  • e32070f189 Decide that joining HS is the one that specifies the join event ID Paul "LeoNerd" Evans 2015-12-08 14:04:40 +0000
  • 8e7f6d44f6 Remove v1 references Erik Johnston 2015-12-08 14:01:16 +0000
  • 2410e8b15a Merge branch 'master' into paul/federation-room-join Paul "LeoNerd" Evans 2015-12-08 14:00:06 +0000
  • 4967b092aa Add description of state response key Erik Johnston 2015-12-08 13:37:32 +0000
  • 27c022f2a4 Merge pull request #220 from matrix-org/daniel/changelog Daniel Wagner-Hall 2015-12-08 13:30:31 +0000
  • a2283f5499 Remove /notify from client-server API Daniel Wagner-Hall 2015-12-08 13:25:31 +0000
  • 217e22fc30 Format changelog more nicely Daniel Wagner-Hall 2015-12-08 13:18:36 +0000
  • 1d2ed9e9d6 Changelogs: indent instead of blockquoting Daniel Wagner-Hall 2015-12-08 11:43:10 +0000
  • dcd51c39b3 Indent state-key descriptions Daniel Wagner-Hall 2015-12-08 10:47:07 +0000
  • 19dfafe376 Remove superfluous space Daniel Wagner-Hall 2015-12-08 10:34:48 +0000
  • dd276d4c4d Add event context module Erik Johnston 2015-12-07 16:56:03 +0000
  • f4b9433c7b Better wording Erik Johnston 2015-12-07 16:33:48 +0000
  • 584104c432 Make example valid event id Erik Johnston 2015-12-07 16:32:43 +0000
  • fda07e0d41 Merge remote-tracking branch 'origin/master' into erikj/event_context_api Erik Johnston 2015-12-07 16:30:19 +0000
  • 856dd9100e Merge remote-tracking branch 'origin/master' into erikj/search_yet_agian Erik Johnston 2015-12-07 16:28:14 +0000
  • 118a6aa040 Reword groupings descriptions Erik Johnston 2015-12-07 16:06:25 +0000
  • 2aef684e7e Add list of required supported groupings Erik Johnston 2015-12-07 16:02:22 +0000
  • c61ae86102 Specify behaviour if server does not support pagination Erik Johnston 2015-12-07 16:00:15 +0000
  • 1ef9cc37e3 Typo Erik Johnston 2015-12-07 15:58:31 +0000
  • fca8e5abe7 Add top level next_batch key to example Erik Johnston 2015-12-07 15:54:08 +0000
  • ff45142663 Flesh out changelog Daniel Wagner-Hall 2015-12-07 15:19:54 +0000
  • db5cad4711 Remove accidentally committed change Daniel Wagner-Hall 2015-12-07 15:15:10 +0000
  • 3939ccf20c Remove e2e drafts from master Richard van der Hoff 2015-12-07 14:45:46 +0000
  • cb3ca223d0 Merge pull request #219 from matrix-org/daniel/chdir Daniel Wagner-Hall 2015-12-07 14:45:38 +0000
  • 99b8a066c8 Make dump-swagger work from all directories Daniel Wagner-Hall 2015-12-07 14:40:42 +0000
  • 6b8ee850c0 Merge pull request #208 from matrix-org/daniel/resolverefs2 Daniel Wagner-Hall 2015-12-07 14:28:40 +0000
  • b8ea5f7ffb Resolve references by default Daniel Wagner-Hall 2015-12-07 14:28:27 +0000
  • 4c82578820 Merge pull request #215 from matrix-org/daniel/changelogs Daniel Wagner-Hall 2015-12-07 14:25:12 +0000
  • 39f43abbb7 Add per-API changelogs Daniel Wagner-Hall 2015-12-07 14:24:10 +0000
  • 5f459e6e0a Merge pull request #217 from matrix-org/daniel/yaml Daniel Wagner-Hall 2015-12-07 14:06:05 +0000
  • f81b967e2d Make all the schema files yaml Daniel Wagner-Hall 2015-12-07 13:53:48 +0000
  • 4b70dd8bac Merge pull request #213 from matrix-org/daniel/tags Daniel Wagner-Hall 2015-12-07 12:45:20 +0000
  • 1f5b6271f2 Generate swagger-ui output for client-server API Daniel Wagner-Hall 2015-12-07 12:45:13 +0000
  • c0e80a2653 Merge 5078cff4ac into c9fee294df Daniel Wagner-Hall 2015-12-07 12:00:43 +0000
  • c9fee294df Merge pull request #211 from matrix-org/daniel/extractas Daniel Wagner-Hall 2015-12-07 12:00:27 +0000
  • 97579f15cb Merge pull request #212 from matrix-org/daniel/pushdictification Daniel Wagner-Hall 2015-12-07 10:39:36 +0000
  • d1d3d27e2f Merge pull request #216 from matrix-org/rav/fix_speculator_redirects Richard van der Hoff 2015-12-07 10:26:38 +0000
  • 3a83b80283 Merge pull request #209 from matrix-org/rav/e2e_docs Richard van der Hoff 2015-12-06 18:31:37 +0000