Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove edits and reactions feature flags from docs and config #10363

Merged
merged 2 commits into from
Jul 18, 2019
Merged

Remove edits and reactions feature flags from docs and config #10363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7731f93
Remove edits feature flag from docs and config
jryans Jul 18, 2019
8398ec5
Remove reactions feature flag from docs and config
jryans Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions config.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 1 addition & 3 deletions riot.im/develop/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"feature_tabbed_settings": "labs",
"feature_sas": "labs",
"feature_room_breadcrumbs": "labs",
"feature_state_counters": "labs",
"feature_reactions": "enable",
"feature_message_editing": "enable"
"feature_state_counters": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
Expand Down