From ea37e777cf66aac15b9e24342c10499760c81523 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 26 Apr 2019 10:56:35 +0100 Subject: [PATCH 1/4] Add reactions feature to config sample --- config.sample.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index 4208438d530..c1aedee0b19 100644 --- a/config.sample.json +++ b/config.sample.json @@ -12,7 +12,8 @@ "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { "feature_groups": "labs", - "feature_pinning": "labs" + "feature_pinning": "labs", + "feature_reactions": "labs" }, "default_federate": true, "default_theme": "light", From ebe2ab504b61b531df9c5b8f873a14a69b21f51d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 1 May 2019 10:30:57 +0100 Subject: [PATCH 2/4] Add reactions feature description --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 28c6b2443c5..e04d6675963 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,8 @@ For a good example, see https://riot.im/develop/config.json. 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user in the `labs` section of settings. The available optional experimental features vary from release to release. + * `feature_reactions` allows reacting to messages with emoji and displaying + reactions from other people 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the homeserver know what email template to use when talking to you. 1. `branding`: Configures various branding and logo details, such as: From 6df5c35b4e0d85ecc3d370b27f85b30052de0935 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 1 May 2019 19:13:44 +0100 Subject: [PATCH 3/4] Move to labs doc --- README.md | 2 -- docs/labs.md | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e04d6675963..28c6b2443c5 100644 --- a/README.md +++ b/README.md @@ -128,8 +128,6 @@ For a good example, see https://riot.im/develop/config.json. 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user in the `labs` section of settings. The available optional experimental features vary from release to release. - * `feature_reactions` allows reacting to messages with emoji and displaying - reactions from other people 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the homeserver know what email template to use when talking to you. 1. `branding`: Configures various branding and logo details, such as: diff --git a/docs/labs.md b/docs/labs.md index 65b16edf90b..41efe71493d 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -29,4 +29,10 @@ Once enabled, send a custom state event to a room to set values: That's it. Now should see your new counter under the header. -[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org \ No newline at end of file +## Reactions + +`feature_reactions` allows reacting to messages with emoji and displaying +reactions from other people. This feature is currently under active development, +and only portions have been implemented so far. + +[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org From bb675fde0cf1676ca3bf1e4a95e3366355b2b7f7 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 1 May 2019 19:14:06 +0100 Subject: [PATCH 4/4] Tweak redundant title --- docs/labs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index 41efe71493d..65b71b3466a 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -1,4 +1,4 @@ -# riot-web Labs features +# Labs features Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in [#riot-web:matrix.org] for more information.