From 908e475ae54d4065573c848712265ce589060266 Mon Sep 17 00:00:00 2001 From: meaz Date: Sat, 6 Feb 2021 00:14:32 +0100 Subject: [PATCH 1/3] Fix compatibility with Grav 1.7.5 --- themes/grav-theme-howto/templates/default.html.twig | 2 +- themes/grav-theme-howto/templates/docsparent.html.twig | 4 ++-- themes/grav-theme-howto/templates/error.html.twig | 2 +- themes/grav-theme-howto/templates/home.html.twig | 2 +- themes/grav-theme-howto/templates/modular.html.twig | 4 ++-- themes/grav-theme-howto/templates/partials/base.html.twig | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/themes/grav-theme-howto/templates/default.html.twig b/themes/grav-theme-howto/templates/default.html.twig index 4dd67b69..1e977389 100644 --- a/themes/grav-theme-howto/templates/default.html.twig +++ b/themes/grav-theme-howto/templates/default.html.twig @@ -1,5 +1,5 @@ {% extends 'partials/base.html.twig' %} {% block content %} - {{ page.content }} + {{ page.content|raw }} {% endblock %} diff --git a/themes/grav-theme-howto/templates/docsparent.html.twig b/themes/grav-theme-howto/templates/docsparent.html.twig index 3b166ff9..72d835e4 100644 --- a/themes/grav-theme-howto/templates/docsparent.html.twig +++ b/themes/grav-theme-howto/templates/docsparent.html.twig @@ -35,14 +35,14 @@ {% include 'partials/docmeta.html.twig' %}
- {{ page.content }} + {{ page.content|raw }}
{% for p in page.children %}
{%if p.header.indexed %} {%if p.media %} - {{ p.media.images|first.html }} + {{ p.media.images|first.html|raw }} {% endif %}
{{ p.title }}
 diff --git a/themes/grav-theme-howto/templates/error.html.twig b/themes/grav-theme-howto/templates/error.html.twig index f23aa786..c9454647 100644 --- a/themes/grav-theme-howto/templates/error.html.twig +++ b/themes/grav-theme-howto/templates/error.html.twig @@ -3,6 +3,6 @@ {% block content %}

Error!

- {{ page.content }} + {{ page.content|raw }}
{% endblock %} diff --git a/themes/grav-theme-howto/templates/home.html.twig b/themes/grav-theme-howto/templates/home.html.twig index 4cbb4e37..356c0cf1 100644 --- a/themes/grav-theme-howto/templates/home.html.twig +++ b/themes/grav-theme-howto/templates/home.html.twig @@ -10,7 +10,7 @@ {% set colsize = ['seven', 'five'] %}
- {{ page.content }} + {{ page.content|raw }}
{% for p in page.collection %} diff --git a/themes/grav-theme-howto/templates/modular.html.twig b/themes/grav-theme-howto/templates/modular.html.twig index f294a977..ecad05f8 100644 --- a/themes/grav-theme-howto/templates/modular.html.twig +++ b/themes/grav-theme-howto/templates/modular.html.twig @@ -4,10 +4,10 @@ {% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %} {% block content %} - {{ page.content }} + {{ page.content|raw }}
{% for module in page.collection() %} - {{ module.content }} + {{ module.content|raw }} {% endfor %}
{% endblock %} diff --git a/themes/grav-theme-howto/templates/partials/base.html.twig b/themes/grav-theme-howto/templates/partials/base.html.twig index 4e3e0c0d..95440f71 100644 --- a/themes/grav-theme-howto/templates/partials/base.html.twig +++ b/themes/grav-theme-howto/templates/partials/base.html.twig @@ -17,13 +17,13 @@ {% do assets.addCss('theme://css/style.css') %} {% do assets.addCss('theme://css/media-queries.css') %} {% endblock %} - {{ assets.css() }} + {{ assets.css()|raw }} - {% block javascripts %} + {% block javascripts %} {% do assets.addJs('jquery', 100) %} {% do assets.addJs('theme://js/howto.js', { group:'bottom' }) %} {% endblock %} - {{ assets.js() }} + {{ assets.js()|raw }} {% endblock head%} From fa55d3e387c11d2b9ee71c60de4427a5ae2f466e Mon Sep 17 00:00:00 2001 From: meaz Date: Wed, 10 Feb 2021 21:55:17 +0100 Subject: [PATCH 2/3] Just fix few typo as suggested by S_7 --- pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md b/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md index ac2d12de..28d03ee9 100755 --- a/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md +++ b/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md @@ -21,7 +21,7 @@ We understand that not everyone wants to use **Disroot** mail as their daily dri However, there are important information you should not miss out on. - - Get notifications for **Forum** and **Nextcloud**. Those services are tight to **Disroot** email and you can't change it. + - Get notifications for **Forum** and **Nextcloud**. These services are tied to **Disroot** email and you can not change it. - To be up to date with what's going on in **Disroot**. Every three / six weeks we're sending email to all users informing them about recent developments, new features and services. We're also sending information about scheduled downtime of services if they are longer than 20 min. We have no intention to spam you with too much information so don't worry about that. This short how-to will show you how to forward your **Disroot** emails to your preferred email address (it should take you no more than three minutes to get this setup). From 41a24b92ad7ec779065ab2ce4ccfff42bf961420 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Feb 2021 01:56:18 -0500 Subject: [PATCH 3/3] Tutorials: Chat -> Transports -> IRC. --- .../04.Chat/04.Transports/01.IRC/docs.en.md | 77 +++++++++++++++++++ .../04.Chat/04.Transports/docs.en.md | 23 ++++++ 2 files changed, 100 insertions(+) create mode 100644 pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md create mode 100644 pages/02.tutorials/04.Chat/04.Transports/docs.en.md diff --git a/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md b/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md new file mode 100644 index 00000000..2def68fd --- /dev/null +++ b/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md @@ -0,0 +1,77 @@ +--- +title: 'Chat Transports: IRC' +published: true +visible: true +indexed: true +updated: + app: Biboumi + app_version: 9.0 +taxonomy: + category: + - docs + tags: + - chat + - xmpp +page-toc: + active: true +--- + +# XMPP <-> IRC + +Disroot Chat provides [Biboumi](https://biboumi.louiz.org/), an IRC transport for XMPP, at irc.disroot.org. + +## SYNTAX + +The syntax for connecting to IRC channel is: + +`#channel%irc.network.tld@irc.disroot.org` + +The syntax for connecting to IRC user is: + +`nick%irc.network.tld@irc.disroot.org` + +## SETTINGS + +Settings can be configured at three different levels, by executing ad-hoc commands on respective items: + +1. IRC-Transport Level: `irc.disroot.org` +2. IRC-Network Level: `irc.network.tld@irc.disroot.org` +3. IRC-Channel Level: `#channel%irc.network.tld@irc.disroot.org` + +If there are common options across all the levels, priority or over-ride of those settings happens in the order of [3] > [2] > [1]. + +## STEPS + +### For short-term/one-shot + +1. Join chat `#channel%irc.network.tld@irc.disroot.org`, with a chosen nick. +2. You'll get messages from `irc.network.tld@irc.disroot.org`. If your nick is registered, send message `NickServ IDENTIFY password`. +3. Start chatting in `#channel`. + +Repeat 1 and 3, for different channel on same network. + +Repeat 1 to 3, for different channel on different network. + +### For long-term/recurring + +1. Add `irc.disroot.org` to your roaster. +2. Execute ad-hoc command on it, then enable history and persistence. +3. Add `irc.network.tld@irc.disroot.org` to your roaster. +4. Execute ad-hoc command on it, then add your username (nick) and password (nick password). +5. Add `#channel%irc.network.tld@irc.disroot.org` to bookmarks and then join. +6. Execute ad-hoc command on it, then enable history and persistence. +7. Start chatting in `#channel`. + +Repeat 5 to 7, if joining different channel on same network. + +Repeat 3 to 7, if joining different channel on different network. + +## CLIENTS + +Any client can be used, although only following clients are known to support ad-hoc commands. + +### Gajim + +1. Right-click on the roaster element. +2. Click 'Execute Command'. +3. Follow the options. diff --git a/pages/02.tutorials/04.Chat/04.Transports/docs.en.md b/pages/02.tutorials/04.Chat/04.Transports/docs.en.md new file mode 100644 index 00000000..abfb5430 --- /dev/null +++ b/pages/02.tutorials/04.Chat/04.Transports/docs.en.md @@ -0,0 +1,23 @@ +--- +title: 'Chat: Transports' +published: true +visible: true +indexed: true +updated: +taxonomy: + category: + - docs + tags: + - chat + - xmpp +page-toc: + active: true +--- + +# XMPP Transports + +In XMPP realm, transports are the means to connect to different protocols. + +Currently, Disroot Chat provides following transports: + +1. [IRC](https://howto.disroot.org/en/tutorials/chat/transports/irc)