Skip to content

Commit

Permalink
Remove reactions feature flag from docs and config
Browse files Browse the repository at this point in the history
Part of #10282
  • Loading branch information
jryans committed Jul 18, 2019
1 parent 7731f93 commit 8398ec5
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
3 changes: 1 addition & 2 deletions config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"showLabsSettings": false,
"features": {
"feature_groups": "labs",
"feature_pinning": "labs",
"feature_reactions": "labs"
"feature_pinning": "labs"
},
"default_federate": true,
"default_theme": "light",
Expand Down
6 changes: 0 additions & 6 deletions docs/labs.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,4 @@ 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.

## 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
3 changes: 1 addition & 2 deletions electron_app/riot.im/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
}
},
"features": {
"feature_lazyloading": "enable",
"feature_reactions": "enable"
"feature_lazyloading": "enable"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
Expand Down
3 changes: 1 addition & 2 deletions riot.im/develop/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"feature_tabbed_settings": "labs",
"feature_sas": "labs",
"feature_room_breadcrumbs": "labs",
"feature_state_counters": "labs",
"feature_reactions": "enable"
"feature_state_counters": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
Expand Down

0 comments on commit 8398ec5

Please sign in to comment.