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

83 commits

Author SHA1 Message Date
Travis Ralston 2e3e189ea2 Merge remote matrix-org/master 2018-08-31 09:31:39 -06:00
Travis Ralston 136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again 
Mention that clients should not be producing invalid HTML
 2018-08-31 08:41:29 -06:00
Travis Ralston afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags 
Update the room tagging documentation
 2018-08-31 08:36:40 -06:00
Travis Ralston c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp 
Specify the minimum CSP for media
 2018-08-31 08:32:33 -06:00
Travis Ralston 73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory 
Clarify the homeserver's behaviour for user searching
 2018-08-31 08:32:02 -06:00
Travis Ralston 9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions 
Add the other fields the server is expected to keep on events
 2018-08-31 08:31:50 -06:00
Travis Ralston 7f719b23e7
Merge pull request #1589 from turt2live/travis/c2s/inhibit-login 
Document the inhibit_login registration option
 2018-08-30 18:21:39 -06:00
Travis Ralston 86c85aea71 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding 2018-08-30 15:23:50 -06:00
Travis Ralston 951b442956
Merge pull request #1558 from turt2live/travis/c2s/fix-events 
Fix client-server event schemas: move `age`, dedupe fields
 2018-08-30 13:36:02 -06:00
Travis Ralston 2d18b0d2d8 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again 2018-08-30 12:21:38 -06:00
Travis Ralston 49c5677969 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory 2018-08-30 12:18:35 -06:00
Travis Ralston 440841d1ff Recommend a CSP rather than require it. 2018-08-30 12:13:21 -06:00
Travis Ralston f04afaa9b9
Merge pull request #780 from mujx/missing-enum-fields 
Add missing enum fields for the set_presence parameter
 2018-08-30 11:37:34 -06:00
Travis Ralston 827033c128 Merge remote matrix-org/master 2018-08-30 11:29:47 -06:00
Travis Ralston 7ecf2406eb
Merge pull request #1590 from turt2live/travis/c2s/403-put-state 
Document 403 error for sending state events
 2018-08-30 06:50:48 -06:00
Hubert Chathi 4230e375fa
Merge pull request #1465 from Zil0/key_sharing 
Document key sharing events
 2018-08-29 23:05:17 -04:00
Hubert Chathi 0130620cc1
Merge pull request #1596 from uhoreg/e2e_sessions 
specify how to handle multiple olm sessions with the same device
 2018-08-29 22:45:38 -04:00
Travis Ralston 30ff020ac7 Changelog 2018-08-29 14:57:05 -06:00
Travis Ralston 26d5a24b88 Merge remote matrix-org/master 2018-08-29 14:17:21 -06:00
Travis Ralston 60b97fcf26 Changelog 2018-08-29 12:39:25 -06:00
Travis Ralston 86f616bb31 Changelog 2018-08-29 11:20:51 -06:00
Travis Ralston 39ef845a53
Merge pull request #1547 from turt2live/travis/c2s/pills 
Document how mentions (pills) work
 2018-08-29 09:13:02 -06:00
Hubert Chathi 5019fb7c49
Merge pull request #1359 from uhoreg/well-known 
.well-known discovery
 2018-08-29 10:40:54 -04:00
Hubert Chathi 9d0fec3645 add changelog 2018-08-29 10:25:24 -04:00
Travis Ralston d1add1f58c Changelog 2018-08-28 19:34:58 -06:00
Travis Ralston 5d0f77de3a changelog 2018-08-28 18:38:12 -06:00
Travis Ralston 4df67d9305 changelog 2018-08-28 14:20:02 -06:00
Travis Ralston 6cdb463829
Merge pull request #1571 from turt2live/travis/general/number-to-int 
Replace applicable types of 'number' to 'integer'
 2018-08-28 07:40:28 -06:00
Travis Ralston 4278a9a516 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events 2018-08-27 19:17:37 -06:00
Travis Ralston e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting 
Define the supported HTML subset for message events
 2018-08-27 19:14:52 -06:00
Travis Ralston f9c7014a65
Merge pull request #1577 from turt2live/travis/c2s/search-filter 
Specify the type of filter the search API expects
 2018-08-27 19:09:19 -06:00
Travis Ralston 03065b0584
Merge pull request #1572 from turt2live/travis/c2s/sync-left-account-data 
Add `account_data` to left rooms in /sync
 2018-08-27 18:59:58 -06:00
Travis Ralston 9527ce31f5
Merge pull request #1570 from turt2live/travis/c2s/sync-filtering 
Update filtering API documentation
 2018-08-27 18:51:00 -06:00
Travis Ralston ee2ebe6792
Merge pull request #1568 from turt2live/travis/c2s/invite-room-state 
Move `invite_room_state` to the correct place in the client-server API
 2018-08-27 18:47:24 -06:00
Travis Ralston fa3e9a7609 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/pills 2018-08-27 18:09:19 -06:00
Travis Ralston 87133d8505
Merge pull request #1574 from turt2live/travis/c2s/fix-directory-put 
Clean up PUT /directory/room
 2018-08-27 17:49:05 -06:00
Travis Ralston 4e885c3f77
Merge pull request #1550 from turt2live/travis/general/acls 
Server ACLs
 2018-08-27 17:48:43 -06:00
Travis Ralston a0b17e6ed6
Merge pull request #1551 from turt2live/travis/c2s/push-rules 
General improvements to the push rules module
 2018-08-27 17:48:01 -06:00
Travis Ralston 7b7933327a Changelog 2018-08-27 15:57:51 -06:00
Travis Ralston ce0befd7d0 Changelog 2018-08-26 22:28:52 -06:00
Travis Ralston fd47184ce3 Changelog 2018-08-26 22:23:38 -06:00
Travis Ralston e8edfba114 Changelog 2018-08-26 21:57:04 -06:00
Travis Ralston e75a1836b8 Changelog 2018-08-26 21:33:43 -06:00
Travis Ralston b0fbd7be7c Changelog 2018-08-26 21:24:33 -06:00
Travis Ralston e926b4a840 Changelog 2018-08-26 21:05:09 -06:00
Travis Ralston 3b2bf18c67 Changelog 2018-08-26 20:54:22 -06:00
Travis Ralston 5ceb132110 Changelog 2018-08-26 20:52:59 -06:00
Travis Ralston 3c472f70e3 Changelog 2018-08-25 22:59:22 -06:00
Valentin Deniaud faa13aaa40 fixup! add key sharing changelog 2018-08-25 17:28:01 +02:00
Travis Ralston 06d43aef17 Changelog 2018-08-24 18:08:05 -06:00