Commit graph

  • ea2ce4b28b Merge pull request #185 from matrix-org/daniel/flattenapis Daniel Wagner-Hall 2015-11-30 11:23:00 +0000
  • 6c66bfc755 Flatten out v1 and v2_alpha directories Daniel Wagner-Hall 2015-11-30 11:22:57 +0000
  • 1a4a9af9a7 Merge pull request #187 from matrix-org/daniel/fixup Daniel Wagner-Hall 2015-11-30 11:15:16 +0000
  • b479b54cd8 Add tables of contents to individual specs Daniel Wagner-Hall 2015-11-27 18:52:58 +0000
  • e401d3e262 Merge pull request #184 from matrix-org/daniel/splitspec Daniel Wagner-Hall 2015-11-27 16:46:06 +0000
  • 30ed918633 speculator: Allow spec viewing for multi-page spec Daniel Wagner-Hall 2015-11-27 14:53:58 +0000
  • e171acf01f Split spec into page-per-section Daniel Wagner-Hall 2015-11-27 14:21:32 +0000
  • 3951785f19 Fix alias path Daniel Wagner-Hall 2015-11-27 16:23:31 +0000
  • bc514dc9c4 Merge pull request #178 from matrix-org/daniel/directory Daniel Wagner-Hall 2015-11-27 16:21:15 +0000
  • eb61f018c2 Merge pull request #144 from matrix-org/paul/small-fixes Paul Evans 2015-11-27 15:42:36 +0000
  • ad8f4d37f4 Merge pull request #180 from matrix-org/daniel/ban Daniel Wagner-Hall 2015-11-27 15:42:23 +0000
  • 7f2813354d Swaggerify /ban Daniel Wagner-Hall 2015-11-27 15:42:21 +0000
  • a20a49abf6 Merge pull request #168 from matrix-org/markjh/client_config Mark Haines 2015-11-27 15:32:21 +0000
  • c5f457cee9 Merge pull request #132 from matrix-org/markjh/room_tags Mark Haines 2015-11-27 15:31:54 +0000
  • 9c449e29b8 Merge pull request #179 from matrix-org/daniel/generateswagger Daniel Wagner-Hall 2015-11-27 15:03:24 +0000
  • f0c99a6925 Generate API docs from swagger Daniel Wagner-Hall 2015-11-27 15:03:22 +0000
  • 9fb26f7c85 Merge pull request #163 from matrix-org/rav/rework_objects Richard van der Hoff 2015-11-27 14:32:56 +0000
  • d9130f0e13 Merge pull request #24 from matrix-org/markjh/end_to_end_encryption Richard van der Hoff 2015-11-27 14:32:26 +0000
  • e961390f44 Merge pull request #183 from matrix-org/daniel/moveintro Kegsay 2015-11-27 13:53:55 +0000
  • ad4d8ae7a6 Move client-server intro to client-server section Daniel Wagner-Hall 2015-11-27 13:50:24 +0000
  • 0b1ba70a32 fix rst markup Richard van der Hoff 2015-11-27 13:33:58 +0000
  • 2dbb8ba56c Fix title levels Richard van der Hoff 2015-11-27 12:53:03 +0000
  • 1e27b104dd Merge pull request #182 from matrix-org/rav/speculator_text_errors Richard van der Hoff 2015-11-27 12:04:19 +0000
  • 2aa4773cc1 Make the speculator serve up errors as plain text Richard van der Hoff 2015-11-27 12:01:03 +0000
  • 51ca25a472 Merge branch 'master' into markjh/end_to_end_encryption Richard van der Hoff 2015-11-27 11:49:11 +0000
  • 5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption Richard van der Hoff 2015-11-27 11:45:49 +0000
  • 8d41536757 Address kegan's comments Richard van der Hoff 2015-11-27 11:37:24 +0000
  • e630f6c0c0 Merge pull request #181 from matrix-org/daniel/requireput Daniel Wagner-Hall 2015-11-27 10:05:21 +0000
  • c539b208f9 Merge branch 'markjh/room_tags' into markjh/client_config Mark Haines 2015-11-26 16:56:39 +0000
  • d39494b6df Fix typo in sync example Mark Haines 2015-11-26 16:55:12 +0000
  • 5e30b5b8d7 Remove POST version of /send Daniel Wagner-Hall 2015-11-26 16:46:29 +0000
  • c25a806cef Fix and include /directory api docs Daniel Wagner-Hall 2015-11-26 15:03:39 +0000
  • 604f78413f Merge pull request #177 from matrix-org/daniel/matrixorgstyle Daniel Wagner-Hall 2015-11-26 12:04:39 +0000
  • ec31c0f518 speculator: allow styling like matrix.org Daniel Wagner-Hall 2015-11-26 12:04:37 +0000
  • 4e42aab245 Fix up the multi-hash ratchet thing Mark Haines 2015-11-25 15:13:00 +0000
  • b0d7302ea5 Merge pull request #137 from matrix-org/daniel/multipleexamples Kegsay 2015-11-25 15:09:43 +0000
  • 4faede73a1 Merge branch 'master' into daniel/multipleexamples Daniel Wagner-Hall 2015-11-25 14:29:33 +0000
  • cc4869e68a Merge pull request #174 from matrix-org/daniel/speculatorhardening Daniel Wagner-Hall 2015-11-23 18:35:55 +0000
  • 6a6cbd9d24 Always try to build continuserv & speculator on jenkins Daniel Wagner-Hall 2015-11-23 17:28:58 +0000
  • c432396079 Add comment Daniel Wagner-Hall 2015-11-23 17:26:32 +0000
  • 866fa58276 Rename Daniel Wagner-Hall 2015-11-23 17:22:53 +0000
  • e045f28b44 Pull out constant for permissions Daniel Wagner-Hall 2015-11-23 17:20:54 +0000
  • 24356d864e Merge pull request #176 from matrix-org/daniel/gendoc Oddvar Lovaas 2015-11-23 10:28:51 +0000
  • 092ff1370a Merge pull request #175 from matrix-org/daniel/genimprovements Oddvar Lovaas 2015-11-23 10:28:01 +0000
  • 5ccc39b850 Say that type is an event type Mark Haines 2015-11-20 18:45:09 +0000
  • e76068a2a6 Merge branch 'markjh/room_tags' into markjh/client_config Mark Haines 2015-11-20 18:40:56 +0000
  • 5bae15d47b Merge branch 'master' into markjh/room_tags Mark Haines 2015-11-20 18:39:15 +0000
  • 181d3f976d Initial proposal for websockets support. Richard van der Hoff 2015-11-16 13:01:20 +0000
  • 46870da57d Add optional profile info and state in search response Erik Johnston 2015-11-20 15:29:36 +0000
  • d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254 Richard van der Hoff 2015-11-20 15:17:55 +0000
  • e7610c7cc5 Merge pull request #165 from matrix-org/rav/flatten_sync Richard van der Hoff 2015-11-20 15:17:34 +0000
  • 4ac85997f5 Fix check Daniel Wagner-Hall 2015-11-19 18:16:02 -0500
  • da93317a78 Take dir not files as args Daniel Wagner-Hall 2015-11-19 18:13:40 -0500
  • ca3a9e3562 exec gendoc outside of script Daniel Wagner-Hall 2015-11-19 17:18:33 -0500
  • e041033048 Rename file Daniel Wagner-Hall 2015-11-19 17:17:50 -0500
  • 8586744771 Add anchors to spec Daniel Wagner-Hall 2015-11-19 16:41:58 -0500
  • 6f1d00097b Only bother trying to fetch if we need to Daniel Wagner-Hall 2015-11-19 16:15:13 -0500
  • 8872e17f93 Fall back to last known HEAD sha if fetch fails Daniel Wagner-Hall 2015-11-19 16:14:22 -0500
  • dd53847211 Include command stderr in error text Daniel Wagner-Hall 2015-11-19 16:11:19 -0500
  • 757b0bcd12 Try to build continuserv and speculator Daniel Wagner-Hall 2015-11-19 16:08:37 -0500
  • 9ad64b02d1 speculator: guard against concurrent git commands Daniel Wagner-Hall 2015-11-19 15:41:15 -0500
  • 032ee75537 Update specification wording to match s/config/account_data/ Mark Haines 2015-11-19 10:42:22 +0000
  • 05c0092664 s/config/account_data/ Mark Haines 2015-11-19 10:36:27 +0000
  • 1a1a7d87dc Revert "Changelog for 0.3.0" Daniel Wagner-Hall 2015-11-18 18:53:20 -0500
  • 5aeaa42a50 Changelog for 0.3.0 Daniel Wagner-Hall 2015-11-18 18:41:25 -0500
  • e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join Paul Evans 2015-11-18 19:21:04 +0000
  • d7d59d78e1 /sync: Put state dict back to being a list Richard van der Hoff 2015-11-18 16:17:29 +0000
  • 7b1e8359d9 Merge pull request #173 from matrix-org/daniel/forgetrooms Daniel Wagner-Hall 2015-11-18 15:51:16 +0000
  • 40f7eab73f s/private_user_data/account_data/ Mark Haines 2015-11-18 15:44:18 +0000
  • 24c4b8b095 Merge branch 'markjh/room_tags' into markjh/client_config Mark Haines 2015-11-18 15:30:16 +0000
  • fcbb985073 s/private_user_data/account_data/ Mark Haines 2015-11-18 15:27:26 +0000
  • 6653362f31 Unflatten 'unsigned' Richard van der Hoff 2015-11-18 15:15:21 +0000
  • 6763317e64 Specify /rooms/:room_id/forget Daniel Wagner-Hall 2015-11-17 10:33:46 -0500
  • a0fb7af8fc Merge pull request #172 from matrix-org/daniel/specleaving Daniel Wagner-Hall 2015-11-17 10:32:23 -0500
  • 8201eaa042 Swaggerify /rooms/:room_id/leave Daniel Wagner-Hall 2015-11-17 15:31:10 +0000
  • 373c6c8270 Add ordering, pagination and grouping comments Erik Johnston 2015-11-17 11:56:05 +0000
  • 34ac544290 Merge branch 'master' into rav/rework_objects Richard van der Hoff 2015-11-17 11:43:12 +0000
  • ffed14a0cd Add next_batch token Erik Johnston 2015-11-17 10:02:02 +0000
  • 994c0974f9 Merge pull request #162 from matrix-org/rav/refactor_tables Kegsay 2015-11-17 09:47:29 +0000
  • d1c685f296 Merge branch 'master' into rav/refactor_tables Kegan Dougal 2015-11-17 09:46:25 +0000
  • 03a0377c76 Plans for end-to-end in matrix Mark Haines 2015-11-16 20:07:42 +0000
  • 5db56df851 Merge pull request #160 from matrix-org/daniel/optional Daniel Wagner-Hall 2015-11-16 13:01:57 -0500
  • 8991c4fa78 Fix schema and example Erik Johnston 2015-11-16 18:00:48 +0000
  • c77b22778f Add some documentation on names of tags Mark Haines 2015-11-16 17:48:41 +0000
  • 5e0e4a8518 Document group and context response keys Erik Johnston 2015-11-16 17:22:56 +0000
  • 25769493b1 Fix template Mark Haines 2015-11-16 17:14:41 +0000
  • e7fbe6f13b Limit the size of a tag Mark Haines 2015-11-16 17:13:02 +0000
  • 48f35e15cb describe how to order rooms that don't have an order in their tags Mark Haines 2015-11-16 17:08:59 +0000
  • 299af673da Specify how ordering of tags is supposed to work Mark Haines 2015-11-16 17:04:19 +0000
  • 7ff593b3de Merge branch 'rav/SPEC-254' into rav/flatten_sync Richard van der Hoff 2015-11-16 16:56:39 +0000
  • 3b390bff3c Merge branch 'master' into markjh/room_tags Mark Haines 2015-11-16 16:56:35 +0000
  • 0db055b4ea Fix another reference to 'txn_id' Richard van der Hoff 2015-11-16 16:54:57 +0000
  • 58b7901b51 Merge branch 'rav/SPEC-254' into rav/flatten_sync Richard van der Hoff 2015-11-16 16:52:43 +0000
  • 8f5783615c Merge branch 'master' into markjh/client_config Mark Haines 2015-11-16 16:51:45 +0000
  • 233e8486bc Wording fix - objects contain keys, not list elements directly Paul "LeoNerd" Evans 2015-11-16 16:50:58 +0000
  • 8316881393 txn_id field in events is called transaction_id Richard van der Hoff 2015-11-16 16:50:54 +0000
  • c3769ef75c Add a module for client config to the specification Mark Haines 2015-11-16 16:49:32 +0000
  • 22b3159a39 Add examples of v1 initialSync and v2 /sync returning the client config Mark Haines 2015-11-16 16:34:39 +0000
  • 769c5285ab Add API for setting client config Mark Haines 2015-11-16 16:33:57 +0000
  • 6cbfba7011 'auth_events' is a List, not a String Paul "LeoNerd" Evans 2015-11-16 16:33:26 +0000