Commit Graph

1263 Commits (4967b092aa5198b8d51f261a7d2746b0a2e13f8b)
 

Author SHA1 Message Date
Richard van der Hoff 5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 9 years ago
Richard van der Hoff 8d41536757 Address kegan's comments
Minor fixes to the e2e spec as raiseds by kegan
9 years ago
Daniel Wagner-Hall e630f6c0c0 Merge pull request #181 from matrix-org/daniel/requireput
Merge pull request #181 from matrix-org/daniel/requireput
9 years ago
Mark Haines c539b208f9 Merge branch 'markjh/room_tags' into markjh/client_config
Conflicts:
	api/client-server/v2_alpha/sync.yaml
9 years ago
Mark Haines d39494b6df Fix typo in sync example 9 years ago
Daniel Wagner-Hall 5e30b5b8d7 Remove POST version of /send
PUT should always be used.
9 years ago
Daniel Wagner-Hall c25a806cef Fix and include /directory api docs 9 years ago
Daniel Wagner-Hall 604f78413f Merge pull request #177 from matrix-org/daniel/matrixorgstyle
speculator: allow styling like matrix.org
9 years ago
Daniel Wagner-Hall ec31c0f518 speculator: allow styling like matrix.org 9 years ago
Mark Haines 4e42aab245 Fix up the multi-hash ratchet thing 9 years ago
Kegsay b0d7302ea5 Merge pull request #137 from matrix-org/daniel/multipleexamples
Daniel/multipleexamples
9 years ago
Daniel Wagner-Hall 4faede73a1 Merge branch 'master' into daniel/multipleexamples 9 years ago
Daniel Wagner-Hall cc4869e68a Merge pull request #174 from matrix-org/daniel/speculatorhardening
Several improvements to speculator to prepare it for actually being used by the masses, not just us devs
9 years ago
Daniel Wagner-Hall 6a6cbd9d24 Always try to build continuserv & speculator on jenkins 9 years ago
Daniel Wagner-Hall c432396079 Add comment 9 years ago
Daniel Wagner-Hall 866fa58276 Rename 9 years ago
Daniel Wagner-Hall e045f28b44 Pull out constant for permissions
Also, drop permissions from 0755 to 0700
9 years ago
Oddvar Lovaas 24356d864e Merge pull request #176 from matrix-org/daniel/gendoc
Tweaks to spec generation for matrix.org
9 years ago
Oddvar Lovaas 092ff1370a Merge pull request #175 from matrix-org/daniel/genimprovements
Add anchors to spec
9 years ago
Mark Haines 5ccc39b850 Say that type is an event type 9 years ago
Mark Haines e76068a2a6 Merge branch 'markjh/room_tags' into markjh/client_config 9 years ago
Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v2_alpha/sync.yaml
9 years ago
Richard van der Hoff 181d3f976d Initial proposal for websockets support. 9 years ago
Erik Johnston 46870da57d Add optional profile info and state in search response 9 years ago
Richard van der Hoff d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254
Fix /sync documentation, post SPEC-254
9 years ago
Richard van der Hoff e7610c7cc5 Merge pull request #165 from matrix-org/rav/flatten_sync
/sync response format tweaks
9 years ago
Daniel Wagner-Hall 4ac85997f5 Fix check 9 years ago
Daniel Wagner-Hall da93317a78 Take dir not files as args 9 years ago
Daniel Wagner-Hall ca3a9e3562 exec gendoc outside of script 9 years ago
Daniel Wagner-Hall e041033048 Rename file 9 years ago
Daniel Wagner-Hall 8586744771 Add anchors to spec
This is currently done by a script on the prod serving machine.

We might as well keep the matrix.org spec and dev spec as similar as
possible.
9 years ago
Daniel Wagner-Hall 6f1d00097b Only bother trying to fetch if we need to 9 years ago
Daniel Wagner-Hall 8872e17f93 Fall back to last known HEAD sha if fetch fails 9 years ago
Daniel Wagner-Hall dd53847211 Include command stderr in error text 9 years ago
Daniel Wagner-Hall 757b0bcd12 Try to build continuserv and speculator 9 years ago
Daniel Wagner-Hall 9ad64b02d1 speculator: guard against concurrent git commands 9 years ago
Mark Haines 032ee75537 Update specification wording to match s/config/account_data/ 9 years ago
Mark Haines 05c0092664 s/config/account_data/ 9 years ago
Daniel Wagner-Hall 1a1a7d87dc Revert "Changelog for 0.3.0"
This reverts commit 5aeaa42a50.
9 years ago
Daniel Wagner-Hall 5aeaa42a50 Changelog for 0.3.0 9 years ago
Paul Evans e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join
Document the federation remote join handshake
9 years ago
Richard van der Hoff d7d59d78e1 /sync: Put state dict back to being a list
Turning the state into a dict-of-dicts caused more pain than it solved. Put it
back to a list.
9 years ago
Daniel Wagner-Hall 7b1e8359d9 Merge pull request #173 from matrix-org/daniel/forgetrooms
Specify /rooms/:room_id/forget
9 years ago
Mark Haines 40f7eab73f s/private_user_data/account_data/ 9 years ago
Mark Haines 24c4b8b095 Merge branch 'markjh/room_tags' into markjh/client_config
Conflicts:
	api/client-server/v1/rooms.yaml
	api/client-server/v1/sync.yaml
	api/client-server/v2_alpha/sync.yaml
	specification/targets.yaml
9 years ago
Mark Haines fcbb985073 s/private_user_data/account_data/ 9 years ago
Richard van der Hoff 6653362f31 Unflatten 'unsigned'
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
9 years ago
Daniel Wagner-Hall 6763317e64 Specify /rooms/:room_id/forget 9 years ago
Daniel Wagner-Hall a0fb7af8fc Merge pull request #172 from matrix-org/daniel/specleaving
Swaggerify /rooms/:room_id/leave
9 years ago
Daniel Wagner-Hall 8201eaa042 Swaggerify /rooms/:room_id/leave 9 years ago