Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-25 10:28:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1058 commits 30 branches 42 tags 32 MiB
Commit graph

1058 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Mark Haines 03a0377c76 Plans for end-to-end in matrix 2015-11-16 20:07:56 +00:00
Daniel Wagner-Hall 5db56df851 Merge pull request #160 from matrix-org/daniel/optional 
Note that invite_room_state is optional
 2015-11-16 13:01:57 -05:00
Paul "LeoNerd" Evans 233e8486bc Wording fix - objects contain keys, not list elements directly 2015-11-16 16:50:58 +00:00
Paul "LeoNerd" Evans 6cbfba7011 'auth_events' is a List, not a String 2015-11-16 16:33:26 +00:00
Paul "LeoNerd" Evans 122c082fcf Comment about origin servers of invites having subsequently left the room 2015-11-16 16:29:43 +00:00
Kegsay 2b19b50f4f Merge pull request #167 from matrix-org/more_nesting 
Support more nesting
 2015-11-16 16:10:55 +00:00
Paul "LeoNerd" Evans 923f05e554 More consistency around 'resident homeserver' 2015-11-16 15:34:11 +00:00
Paul "LeoNerd" Evans 36af793f05 s/full object/full event/ 2015-11-16 15:30:22 +00:00
Kegan Dougal 8648f86032 Moar spaces 2015-11-16 15:08:37 +00:00
Erik Johnston 96be7ff241 Support more nesting 2015-11-16 15:00:31 +00:00
Richard van der Hoff cc8ef691fb Rewrite the table templates 
Allow columns to stretch if they end up with wide content.

Apart from the hassle of having to manually update the calculations, having the
columns wide enough to hold the widest thing they might ever have leads to
tables with lots of whitespace in the results.
 2015-11-15 16:58:35 +00:00
Paul "LeoNerd" Evans 988d773476 /make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517) 2015-11-13 17:49:22 +00:00
Paul "LeoNerd" Evans 885dd1e86c Explain the 'prev_events' join protoevent key 2015-11-13 16:39:31 +00:00
Paul "LeoNerd" Evans db5a90edcd Avoid using the words 'current state' when talking about the result of the /make_join request 2015-11-13 16:36:26 +00:00
Paul "LeoNerd" Evans aac45295ee Remark that the directory server step could be skipped in an invite case 2015-11-13 16:34:22 +00:00
Paul "LeoNerd" Evans d7c69fae43 Fix typo 'process' 2015-11-13 16:33:34 +00:00
Daniel Wagner-Hall ea364a108b Merge pull request #161 from matrix-org/daniel/guestdisplaynames 
Merge pull request #161 from matrix-org/daniel/guestdisplaynames

Guests are allowed to set displaynames
 2015-11-12 13:23:49 +00:00
Daniel Wagner-Hall c5e4d08e3b Merge pull request #158 from matrix-org/daniel/guestroominitialsync 
Merge pull request #158 from matrix-org/daniel/guestroominitialsync

Guest users are allowed room initialSync
 2015-11-12 13:20:39 +00:00
Daniel Wagner-Hall 29d9c8eec6 Guests are allowed to set displaynames 2015-11-12 12:05:02 +00:00
Daniel Wagner-Hall 4d3175fc8b Note that invite_room_state is optional 2015-11-12 10:45:57 +00:00
Daniel Wagner-Hall 061105c9dc Guest users are allowed room initialSync 2015-11-11 17:18:58 +00:00
Daniel Wagner-Hall 703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch 
speculator: Nessle up some more if statements
 2015-11-11 15:25:04 +00:00
Daniel Wagner-Hall 0f0359d9c1 speculator: Nessle up some more if statements 2015-11-11 15:13:34 +00:00
Daniel Wagner-Hall 567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch 
speculator: Fetch before deciding head is fresh
 2015-11-11 15:11:51 +00:00
Daniel Wagner-Hall 740cc66a7c speculator: Fetch before deciding head is fresh 2015-11-11 14:01:45 +00:00
Daniel Wagner-Hall a80fcfa83b Merge pull request #155 from matrix-org/daniel/publicwritable2 
Specify /publicRooms world_readable and guest_access

Depends on https://github.com/matrix-org/matrix-doc/pull/154
 2015-11-11 11:53:37 +00:00
Daniel Wagner-Hall dcf54e11b1 Specify /publicRooms world_readable and guest_access 
Depends on https://github.com/matrix-org/matrix-doc/pull/154
 2015-11-11 11:53:31 +00:00
Daniel Wagner-Hall b6a4dfa7cd Merge pull request #154 from matrix-org/daniel/publicwritable 
Specify /publicRooms
 2015-11-11 11:39:42 +00:00
Daniel Wagner-Hall d7357ef9b7 Specify /publicRooms 2015-11-11 11:39:40 +00:00
Daniel Wagner-Hall 27ffe7bacd Don't serve rst diffs as HTML 2015-11-10 15:35:10 +00:00
Daniel Wagner-Hall 624756fb9a Merge pull request #153 from matrix-org/daniel/3pidyetagain 
3pid invites: remove mentions of display_name
 2015-11-10 12:44:13 +00:00
Daniel Wagner-Hall bdf755632e Merge pull request #152 from matrix-org/daniel/macaroons 
Document macaroon type=login
 2015-11-10 12:43:36 +00:00
Kegsay c8f6ed1107 More formatting.. 2015-11-10 11:31:31 +00:00
Kegsay 51fe4a90b6 More formatting fixes 2015-11-10 11:28:27 +00:00
Kegsay c1866ebebc Fix table formatting 2015-11-10 11:26:06 +00:00
Daniel Wagner-Hall 24c2036a35 3pid invites: remove mentions of display_name 2015-11-09 17:30:18 +00:00
Daniel Wagner-Hall 68bec3a61a Merge pull request #151 from matrix-org/daniel/continuservconcurrency 
continuserv: guard concurrent accesses to wg
 2015-11-09 16:11:56 +00:00
Daniel Wagner-Hall c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency 
Conflicts:
	scripts/continuserv/main.go
 2015-11-09 16:11:34 +00:00
Daniel Wagner-Hall 436a35e9f6 Document macaroon type=login 2015-11-09 16:04:31 +00:00