Skip to content

Commit

Permalink
Merge pull request #10365 from vector-im/jryans/v1.3.0/rm-reactions-e…
Browse files Browse the repository at this point in the history
…dits-flags

Remove edits and reactions feature flags from docs and config
  • Loading branch information
jryans authored Jul 18, 2019
2 parents 343279e + 06ce10b commit 48759fd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
4 changes: 1 addition & 3 deletions config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
"showLabsSettings": false,
"features": {
"feature_groups": "labs",
"feature_pinning": "labs",
"feature_reactions": "labs",
"feature_message_editing": "labs"
"feature_pinning": "labs"
},
"default_federate": true,
"default_theme": "light",
Expand Down
13 changes: 0 additions & 13 deletions docs/labs.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +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.

## Message editing

`feature_message_editing` allows editing messages after they have been sent,
accessible from the reaction/context bar when hovering a message.
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
4 changes: 1 addition & 3 deletions electron_app/riot.im/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
}
},
"features": {
"feature_lazyloading": "enable",
"feature_reactions": "enable",
"feature_message_editing": "enable"
"feature_lazyloading": "enable"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
Expand Down

0 comments on commit 48759fd

Please sign in to comment.