Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-26 19:08:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1129 commits 30 branches 42 tags 32 MiB
Commit graph

1129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff 9fb26f7c85 Merge pull request #163 from matrix-org/rav/rework_objects 
Updates to swagger table generation
 2015-11-27 14:32:56 +00:00
Richard van der Hoff d9130f0e13 Merge pull request #24 from matrix-org/markjh/end_to_end_encryption 
Basic specification for key distribution for end-to-end cryptography.
 2015-11-27 14:32:26 +00:00
Kegsay e961390f44 Merge pull request #183 from matrix-org/daniel/moveintro 
Merge pull request # 183 from matrix-org/daniel/moveintro
 2015-11-27 13:53:55 +00:00
Daniel Wagner-Hall ad4d8ae7a6 Move client-server intro to client-server section 2015-11-27 13:50:24 +00:00
Richard van der Hoff 0b1ba70a32 fix rst markup 
`` > `
 2015-11-27 13:33:58 +00:00
Richard van der Hoff 2dbb8ba56c Fix title levels 
make the title decoration consistent with the rest of the spec
 2015-11-27 12:53:03 +00:00
Richard van der Hoff 1e27b104dd Merge pull request #182 from matrix-org/rav/speculator_text_errors 
Make the speculator serve up errors as plain text
 2015-11-27 12:04:19 +00:00
Richard van der Hoff 2aa4773cc1 Make the speculator serve up errors as plain text 
... so that they are legible.
 2015-11-27 12:01:03 +00:00
Richard van der Hoff 51ca25a472 Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:49:11 +00:00
Richard van der Hoff 5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:45:49 +00:00
Richard van der Hoff 8d41536757 Address kegan's comments 
Minor fixes to the e2e spec as raiseds by kegan
 2015-11-27 11:37:24 +00:00
Daniel Wagner-Hall e630f6c0c0 Merge pull request #181 from matrix-org/daniel/requireput 
Merge pull request #181 from matrix-org/daniel/requireput
 2015-11-27 10:05:21 +00:00
Daniel Wagner-Hall 5e30b5b8d7 Remove POST version of /send 
PUT should always be used.
 2015-11-26 16:46:29 +00:00
Daniel Wagner-Hall 604f78413f Merge pull request #177 from matrix-org/daniel/matrixorgstyle 
speculator: allow styling like matrix.org
 2015-11-26 12:04:39 +00:00
Daniel Wagner-Hall ec31c0f518 speculator: allow styling like matrix.org 2015-11-26 12:04:37 +00:00
Mark Haines 4e42aab245 Fix up the multi-hash ratchet thing 2015-11-25 15:13:13 +00:00
Kegsay b0d7302ea5 Merge pull request #137 from matrix-org/daniel/multipleexamples 
Daniel/multipleexamples
 2015-11-25 15:09:43 +00:00
Daniel Wagner-Hall 4faede73a1 Merge branch 'master' into daniel/multipleexamples 2015-11-25 14:29:33 +00:00
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
 2015-11-23 18:35:55 +00:00
Daniel Wagner-Hall 6a6cbd9d24 Always try to build continuserv & speculator on jenkins 2015-11-23 18:32:10 +00:00
Daniel Wagner-Hall c432396079 Add comment 2015-11-23 17:26:32 +00:00
Daniel Wagner-Hall 866fa58276 Rename 2015-11-23 17:22:53 +00:00
Daniel Wagner-Hall e045f28b44 Pull out constant for permissions 
Also, drop permissions from 0755 to 0700
 2015-11-23 17:20:54 +00:00
Oddvar Lovaas 24356d864e Merge pull request #176 from matrix-org/daniel/gendoc 
Tweaks to spec generation for matrix.org
 2015-11-23 10:28:51 +00:00
Oddvar Lovaas 092ff1370a Merge pull request #175 from matrix-org/daniel/genimprovements 
Add anchors to spec
 2015-11-23 10:28:01 +00:00
Richard van der Hoff 181d3f976d Initial proposal for websockets support. 2015-11-20 15:29:54 +00:00
Richard van der Hoff d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254 
Fix /sync documentation, post SPEC-254
 2015-11-20 15:17:55 +00:00
Richard van der Hoff e7610c7cc5 Merge pull request #165 from matrix-org/rav/flatten_sync 
/sync response format tweaks
 2015-11-20 15:17:34 +00:00
Daniel Wagner-Hall 4ac85997f5 Fix check 2015-11-19 18:16:02 -05:00
Daniel Wagner-Hall da93317a78 Take dir not files as args 2015-11-19 18:13:40 -05:00
Daniel Wagner-Hall ca3a9e3562 exec gendoc outside of script 2015-11-19 17:38:54 -05:00
Daniel Wagner-Hall e041033048 Rename file 2015-11-19 17:38:49 -05:00
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.
 2015-11-19 16:41:58 -05:00
Daniel Wagner-Hall 6f1d00097b Only bother trying to fetch if we need to 2015-11-19 16:15:13 -05:00
Daniel Wagner-Hall 8872e17f93 Fall back to last known HEAD sha if fetch fails 2015-11-19 16:14:22 -05:00
Daniel Wagner-Hall dd53847211 Include command stderr in error text 2015-11-19 16:11:19 -05:00
Daniel Wagner-Hall 757b0bcd12 Try to build continuserv and speculator 2015-11-19 16:09:28 -05:00
Daniel Wagner-Hall 9ad64b02d1 speculator: guard against concurrent git commands 2015-11-19 15:41:15 -05:00
Daniel Wagner-Hall 1a1a7d87dc Revert "Changelog for 0.3.0" 
This reverts commit 5aeaa42a50.
 2015-11-18 18:53:20 -05:00
Daniel Wagner-Hall 5aeaa42a50 Changelog for 0.3.0 2015-11-18 18:41:25 -05:00
Paul Evans e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join 
Document the federation remote join handshake
 2015-11-18 19:21:04 +00:00
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.
 2015-11-18 16:17:29 +00:00
Daniel Wagner-Hall 7b1e8359d9 Merge pull request #173 from matrix-org/daniel/forgetrooms 
Specify /rooms/:room_id/forget
 2015-11-18 15:51:16 +00:00
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.
 2015-11-18 15:15:21 +00:00
Daniel Wagner-Hall 6763317e64 Specify /rooms/:room_id/forget 2015-11-17 10:33:46 -05:00
Daniel Wagner-Hall a0fb7af8fc Merge pull request #172 from matrix-org/daniel/specleaving 
Swaggerify /rooms/:room_id/leave
 2015-11-17 10:32:23 -05:00
Daniel Wagner-Hall 8201eaa042 Swaggerify /rooms/:room_id/leave 2015-11-17 15:31:10 +00:00
Richard van der Hoff 34ac544290 Merge branch 'master' into rav/rework_objects 
Conflicts:
	templating/matrix_templates/units.py
 2015-11-17 11:43:12 +00:00
Kegsay 994c0974f9 Merge pull request #162 from matrix-org/rav/refactor_tables 
Rewrite the table templates
 2015-11-17 09:47:29 +00:00
Kegan Dougal d1c685f296 Merge branch 'master' into rav/refactor_tables 2015-11-17 09:46:25 +00:00