diff --git a/specification/proposals.rst b/specification/proposals.rst index 9e0becf35..6c41a0acd 100644 --- a/specification/proposals.rst +++ b/specification/proposals.rst @@ -49,6 +49,14 @@ proposal-wip - `@leonerd`_ - None - + * - `MSC1148 `_ + - Support for websockets + - 2015-11-16 + - 2018-06-04 + - `1148-1 `_, `1148-2 `_ + - `@richvdh`_, `@krombel`_ + - None + - * - `MSC1238 `_ - Push to Talk - 2016-04-13 @@ -193,6 +201,14 @@ proposal-wip - `@uhoreg`_ - None - + * - `MSC1280 `_ + - Mechanisms for communicating erasure requests to bots and federated homeservers + - 2018-06-05 + - 2018-06-05 + - `1280-1 `_ + - `@richvdh`_ + - None + - @@ -215,7 +231,7 @@ proposal-ready-for-review * - `MSC1232 `_ - Media limits API - 2018-05-04 - - 2018-05-15 + - 2018-06-05 - `1232-1 `_ - `@Half-Shot`_ - None @@ -231,7 +247,7 @@ proposal-ready-for-review * - `MSC1270 `_ - Add /_matrix/media/v1/resolve_url to Client-Server API: download and preview urls in the clients despite CORS - 2018-05-31 - - 2018-06-04 + - 2018-06-05 - `1270-1 `_ - `@oivoodoo`_ - None @@ -636,14 +652,15 @@ obsolete .. _@rxl881: https://github.com/rxl881 -.. _@psaavedra: https://github.com/psaavedra +.. _@turt2live: https://github.com/turt2live .. _@erikjohnston: https://github.com/erikjohnston .. _@t3chguy: https://github.com/t3chguy .. _@Kegsay: https://github.com/Kegsay .. _@KitsuneRal: https://github.com/KitsuneRal .. _@leonerd: https://github.com/leonerd -.. _@turt2live: https://github.com/turt2live +.. _@psaavedra: https://github.com/psaavedra .. _@ara4n: https://github.com/ara4n +.. _@krombel: https://github.com/krombel .. _@maxidor: https://github.com/maxidor .. _@uhoreg: https://github.com/uhoreg .. _@pik: https://github.com/pik