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

2996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson ed9028f0fc merge again... 2015-10-06 14:46:13 -05:00
Matthew Hodgson 2621c22956 fix barefaced lie regarding the passivity of ASes 2015-10-06 14:42:38 -05:00
Matthew Hodgson f62fa6b980 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 2015-10-06 14:42:17 -05:00
Oddvar Lovaas 10f3e7e84f Merge branch 'master' of github.com:matrix-org/matrix-doc 2015-10-06 20:23:42 +01:00
Oddvar Lovaas 6e6585cebc FAQ draft 2015-10-06 20:21:49 +01:00
Matthew Hodgson f759dc30d2 major refresh of the existing FAQ content (WIP) 2015-10-06 14:13:40 -05:00
Matthew Hodgson 7ae2573113 fix barefaced lie regarding the passivity of ASes 2015-10-06 14:13:40 -05:00
Mark Haines 034241eb20 Missing symlink for the v2 swagger APIs 2015-10-06 17:43:04 +01:00
Mark Haines 509d178d58 Fix the receipts API to be valid swagger 2015-10-06 17:40:45 +01:00
Mark Haines 4f606cf3a7 Add the fields required by the templating system to v2 sync 2015-10-06 17:31:05 +01:00
Mark Haines 5a5a6565ff Merge pull request #68 from matrix-org/markjh/v2_sync_api 
Swagger documentation for the v2 sync API
 2015-10-06 16:51:06 +01:00
Matthew Hodgson 39faccb00d CS API is not just v1 surely 2015-10-06 09:38:46 -05:00
Mark Haines 0ce533d153 Split the room_map into separate sections based on whether they are 
"joined/invited/archived".

Rename the room_map to rooms and remove the grouping indirection. When we
want groups then we can add them under a separate key, either at the
top-level or as part of the events themselves.
 2015-10-06 13:42:03 +01:00
Mark Haines 0e5b00feaa Fix event type in v2 sync example 2015-10-05 16:10:25 +01:00
Mark Haines bbb5fa9398 Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events 2015-10-05 15:36:01 +01:00
Mark Haines a7b808c5cd Add a invite_state key for holding the state that is bundled with an 
invite. This is kept separate from the actual state for the room as
it may be derived from an incomplete, unverified copy of the state
that was bundled with an invite event received over federation.
 2015-10-05 15:26:33 +01:00
Mark Haines ed0f6d3ff3 Typo 2015-10-05 14:22:50 +01:00
Mark Haines 97cdd8106c s|client/api/v2_alpha|/client/v2_alpha| 2015-10-05 14:21:16 +01:00
Kegan Dougal 8e5c832ff9 Flesh out more of the IM module 2015-10-05 13:45:23 +01:00
Kegan Dougal 47cf958b54 Merge branch 'master' into module-im 2015-10-05 10:16:44 +01:00
Erik Johnston 99ca68ba6d Merge pull request #71 from matrix-org/erikj/disable_federation 
Add flag to disable federation.
 2015-10-05 09:19:17 +01:00
Erik Johnston 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation 2015-10-05 09:17:28 +01:00
Kegan Dougal db660d705a Merge branch 'release-0.2.0' 2015-10-02 16:44:16 +01:00
Kegan Dougal 28fd1aa205 Go into a bit more detail about feature profiles 2015-10-02 16:34:06 +01:00
Kegan Dougal 2fbf851a75 Merge branch 'master' into release-0.2.0 2015-10-02 16:25:23 +01:00
Kegsay 8c092e3d11 Merge pull request #74 from matrix-org/module-presence 
Presence module
 2015-10-02 16:24:53 +01:00
Kegan Dougal 417c5b53c4 Remove duplicate sentences from merge conflicts 2015-10-02 16:24:33 +01:00
Mark Haines 047419f2ad Remove the room_id since it is redundent. Remove text about invite event handling till we've thought about it some more. 2015-10-02 16:21:48 +01:00
Mark Haines bde003fe86 Split the rooms out into a separate top level key. 
Divide the rooms into separate groups in preparation for adding tag
support.

Further subdivide the rooms into "joined/invited/archived" based the
membership of the user in the room because that membership affects what
events the user can view from the room. E.g only users that are joined
to a room may see the ephemeral events for the room.
 2015-10-02 16:14:24 +01:00
Kegan Dougal c8ddf1af09 Add changelog 2015-10-02 16:00:15 +01:00
Daniel Wagner-Hall b29fdebec2 Give example of verification dance 2015-10-02 09:14:31 -05:00
Kegan Dougal 458383585f Stub sections 2015-10-02 15:03:55 +01:00
Kegsay ead79614ff Merge pull request #78 from matrix-org/module-typing2 
Typing module
 2015-10-02 14:36:30 +01:00
Daniel Wagner-Hall 9d8dc7971d Review comments 2015-10-02 08:33:12 -05:00
Daniel Wagner-Hall 7df3d9090a Merge pull request #81 from matrix-org/daniel/speculatormerge 
speculator: Merge after fetching, so that /spec/head works
 2015-10-02 07:33:34 -05:00
Daniel Wagner-Hall 0e8f1b5475 Quote args 2015-10-02 07:33:26 -05:00
Mark Haines a73cc50aa9 s|client/api/v2_alpha|client/v2_alpha| 2015-10-02 13:03:39 +01:00
Kegsay 68df99409a Merge pull request #83 from matrix-org/module-content-repo 
Content Repo Module
 2015-10-02 11:27:41 +01:00
Kegsay f38473efd9 Merge pull request #82 from matrix-org/daniel/reportport 
speculator: Report listening port
 2015-10-02 11:13:43 +01:00
Erik Johnston ccdd376f30 Merge pull request #63 from matrix-org/erikj/room_create_preset 
Update the room creation API spec to include new keys: 'preset' and 'initial_state'
 2015-10-02 11:13:06 +01:00
Kegan Dougal 09ac367847 Merge branch 'master' into module-content-repo 
Conflicts:
	templating/matrix_templates/units.py
 2015-10-02 10:46:46 +01:00
Kegan Dougal 4dabcd112e Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type 2015-10-02 10:44:50 +01:00
Erik Johnston 912a8ca760 Be more explicit about keys that are clobbered 2015-10-02 10:30:45 +01:00
Erik Johnston dbc72c43ac s/private_chat_shared_power/trusted_private_chat/ 2015-10-02 10:28:29 +01:00
Kegan Dougal 3d9dbe42e6 Bump to swagger-parser 3.2.1 - remove x- keys on headers 
Removed x- keys due to https://github.com/BigstickCarpet/swagger-parser/issues/23
 2015-10-02 10:21:48 +01:00
Daniel Wagner-Hall 9cda004848 Fix ref 2015-10-01 22:27:19 -05:00
Daniel Wagner-Hall fdccf35c47 Banish more tabs 2015-10-01 22:23:24 -05:00
Daniel Wagner-Hall e996933a29 Banish the tabs 2015-10-01 22:21:34 -05:00
Daniel Wagner-Hall af7d2ca9fc Update 3pid invite spec 
This takes into account:
 1) That finding the existing servers of a room is hard
 2) Federation
 2015-10-01 22:19:11 -05:00
Daniel Wagner-Hall d2c56fb7a3 Merge branch 'master' into daniel/threepidinvites-2 2015-10-01 21:18:50 -05:00