gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into element

This commit is contained in:
Bruno Windels 2020-07-09 17:59:47 +02:00
parent bc57e6fd70 dbd62fb213
commit b5d0047f39
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sample.json
View File

@ -31,8 +31,7 @@
"feature_pinning": "labs", "feature_pinning": "labs",
"feature_custom_status": "labs", "feature_custom_status": "labs",
"feature_custom_tags": "labs", "feature_custom_tags": "labs",
"feature_state_counters": "labs", "feature_state_counters": "labs"
"feature_irc_ui": "labs"
}, },
"default_federate": true, "default_federate": true,
"default_theme": "light", "default_theme": "light",

5
docs/labs.md
View File

@ -105,8 +105,3 @@ For some sample themes, check out [aaronraimist/riot-web-themes](https://github.
A complete rewrite of the room list is underway to increase performance, stability, A complete rewrite of the room list is underway to increase performance, stability,
and general usability. This is still rapidly changing, but feel free to give it a test. and general usability. This is still rapidly changing, but feel free to give it a test.
## IRC message layout (`feature_irc_ui`)
Adds an option to change the message layout to an IRC style ` timestamp | avatar
| name | message `

3
riot.im/develop/config.json
View File

@ -25,8 +25,7 @@
"feature_bridge_state": "labs", "feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs", "feature_presence_in_room_list": "labs",
"feature_custom_themes": "labs", "feature_custom_themes": "labs",
"feature_new_room_list": "labs", "feature_new_room_list": "labs"
"feature_irc_ui": "labs"
}, },
"piwik": { "piwik": {
"url": "https://piwik.riot.im/", "url": "https://piwik.riot.im/",