From 4f7081fc2b9c188af5e87f4df1745133d7b2f9a9 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 23 Apr 2020 19:12:10 +0100 Subject: [PATCH 1/5] Add labs flag for alternate message layouts --- config.sample.json | 1 + docs/labs.md | 4 ++++ riot.im/develop/config.json | 1 + 3 files changed, 6 insertions(+) diff --git a/config.sample.json b/config.sample.json index 360a47a7f4..8497bba489 100644 --- a/config.sample.json +++ b/config.sample.json @@ -26,6 +26,7 @@ "defaultCountryCode": "GB", "showLabsSettings": false, "features": { + "feature_alternate_message_layouts": "labs", "feature_font_scaling": "labs", "feature_pinning": "labs", "feature_custom_status": "labs", diff --git a/docs/labs.md b/docs/labs.md index 6dcd823f96..802722a9cc 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -12,6 +12,10 @@ dropped. Ask in the room if you are unclear about any details here.** Enables font scaling options for accessibility. To alter the scale check the appearance tab in settings. +## Alternate message layouts (`feature_alternate_message_layouts`) + +Enables options in rooms settings to switch between message layouts such as the default and "irc-like" layouts. + ## Message pinning (`feature_pinning`) Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index bdc688a3e6..bd949dec7c 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -13,6 +13,7 @@ "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { + "feature_alternate_message_layouts": "labs", "feature_font_scaling": "labs", "feature_pinning": "labs", "feature_custom_status": "labs", From 6d19d1b3464991b9155f1ad583049d29ba11bc4a Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Tue, 28 Apr 2020 16:56:23 +0100 Subject: [PATCH 2/5] Change setting location. --- docs/labs.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/labs.md b/docs/labs.md index 802722a9cc..79e18f6547 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -14,7 +14,8 @@ appearance tab in settings. ## Alternate message layouts (`feature_alternate_message_layouts`) -Enables options in rooms settings to switch between message layouts such as the default and "irc-like" layouts. +Enables options in appearance settings to switch between message layouts such as +the default and "irc-like" layouts. ## Message pinning (`feature_pinning`) From 4ec952f1f1eb4c7580c29ba23366b5c8867ade3a Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 7 May 2020 14:12:35 +0100 Subject: [PATCH 3/5] Move irc layout to labs --- config.sample.json | 5 +++-- riot.im/develop/config.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config.sample.json b/config.sample.json index 8497bba489..8ab4e994ed 100644 --- a/config.sample.json +++ b/config.sample.json @@ -26,12 +26,13 @@ "defaultCountryCode": "GB", "showLabsSettings": false, "features": { - "feature_alternate_message_layouts": "labs", "feature_font_scaling": "labs", "feature_pinning": "labs", "feature_custom_status": "labs", "feature_custom_tags": "labs", - "feature_state_counters": "labs" + "feature_state_counters": "labs", + "feature_irc_ui": "labs", + "feature_no_timeline_avatars": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index bd949dec7c..ab09c54e79 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -13,7 +13,6 @@ "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { - "feature_alternate_message_layouts": "labs", "feature_font_scaling": "labs", "feature_pinning": "labs", "feature_custom_status": "labs", @@ -27,7 +26,9 @@ "feature_event_indexing": "disable", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs" + "feature_custom_themes": "labs", + "feature_irc_ui": "labs", + "feature_no_timeline_avatars": "labs" }, "piwik": { "url": "https://piwik.riot.im/", From 585cfbbaf9b8f3c3df8705622b7fd4982c3192c2 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 7 May 2020 16:18:11 +0100 Subject: [PATCH 4/5] Update docs --- docs/labs.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 79e18f6547..e4fc8ed4cc 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -12,11 +12,6 @@ dropped. Ask in the room if you are unclear about any details here.** Enables font scaling options for accessibility. To alter the scale check the appearance tab in settings. -## Alternate message layouts (`feature_alternate_message_layouts`) - -Enables options in appearance settings to switch between message layouts such as -the default and "irc-like" layouts. - ## Message pinning (`feature_pinning`) Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message @@ -128,4 +123,15 @@ normally these themes need to be defined in the config for Riot. This labs flag adds an ability for end users to add themes themselves by using a URL to the JSON theme definition. +## IRC message layout (`feature_irc_ui`) + +Adds an option to change the message layout to an IRC style ` timestamp | avatar +| name | message ` + +## Remove timeline avatars (`feature_no_timeline_avatars`) + +Adds the option to remove the avatars in the message layout. This is intended to +be used in conjunction with the irc layout however it available for both +layouts. + For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes). From 3a7578b7eeb997ff8c295ccc5959805d4570b956 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Tue, 19 May 2020 18:30:30 +0100 Subject: [PATCH 5/5] Remove avatar flag --- config.sample.json | 3 +-- docs/labs.md | 9 ++------- riot.im/develop/config.json | 3 +-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/config.sample.json b/config.sample.json index 8ab4e994ed..a4110a1597 100644 --- a/config.sample.json +++ b/config.sample.json @@ -31,8 +31,7 @@ "feature_custom_status": "labs", "feature_custom_tags": "labs", "feature_state_counters": "labs", - "feature_irc_ui": "labs", - "feature_no_timeline_avatars": "labs" + "feature_irc_ui": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/labs.md b/docs/labs.md index e4fc8ed4cc..39d9dfcb1b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -123,15 +123,10 @@ normally these themes need to be defined in the config for Riot. This labs flag adds an ability for end users to add themes themselves by using a URL to the JSON theme definition. +For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes). + ## IRC message layout (`feature_irc_ui`) Adds an option to change the message layout to an IRC style ` timestamp | avatar | name | message ` -## Remove timeline avatars (`feature_no_timeline_avatars`) - -Adds the option to remove the avatars in the message layout. This is intended to -be used in conjunction with the irc layout however it available for both -layouts. - -For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes). diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index ab09c54e79..5dcc91e0e3 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -27,8 +27,7 @@ "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", "feature_custom_themes": "labs", - "feature_irc_ui": "labs", - "feature_no_timeline_avatars": "labs" + "feature_irc_ui": "labs" }, "piwik": { "url": "https://piwik.riot.im/",