From 719f185b36f389313d39e9ad46178bb6b38de2fe Mon Sep 17 00:00:00 2001 From: muppeth Date: Wed, 6 Sep 2017 02:16:47 +0200 Subject: [PATCH] layout and otherfixes (until bin) --- pages/02.about/_about-what/fullbar.md | 42 ------------- .../{2col-right.md => 2col-left.md} | 8 +-- .../02.email/_email-webmail/2col-right.md | 12 ++-- .../_nextcloud-share/2col-left.md | 3 +- .../03.nextcloud/_nextcloud/2col-right.md | 7 +++ .../04.diaspora/_diaspora/2col-right.md | 2 + .../03.services/05.forum/_forum/2col-right.md | 8 ++- .../05.forum/_forum/Nextcloud_Logo.png | Bin 16568 -> 0 bytes .../06.matrix/_matrix/2col-right.md | 8 ++- .../07.xmpp/_xmpp-clients/2col-right.md | 16 ++--- .../03.services/07.xmpp/_xmpp-modules/3col.md | 59 +++++++++--------- pages/03.services/07.xmpp/_xmpp/2col-right.md | 3 + pages/03.services/08.pads/_pads/2col-right.md | 9 +++ pages/03.services/09.bin/_bin/2col-right.md | 5 +- pages/04.contact/_contact/2col-left.md | 5 +- pages/04.contact/_contact/fullbar.md | 20 ------ pages/06.donate/_donate/2col-right.md | 3 +- 17 files changed, 91 insertions(+), 119 deletions(-) delete mode 100644 pages/02.about/_about-what/fullbar.md rename pages/03.services/02.email/_email-clients/{2col-right.md => 2col-left.md} (97%) delete mode 100644 pages/03.services/05.forum/_forum/Nextcloud_Logo.png delete mode 100644 pages/04.contact/_contact/fullbar.md diff --git a/pages/02.about/_about-what/fullbar.md b/pages/02.about/_about-what/fullbar.md deleted file mode 100644 index 0d823951..00000000 --- a/pages/02.about/_about-what/fullbar.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -title: 'About us' -bgcolor: '#FFFFFF' -fontcolor: '#7A7A7A' -text_align: left ---- - -![](about-organize.jpg) - -## Federation and Decentralization - -Most internet services are run from centralized point owned and run by corporations. These store private data of their users and analyze it using advanced algorithms in order to create accurate profiles of their 'users'. This information is often used to exploit the people for the sake of advertisers. Information can also be obtained by governmental institutions or by malicious hackers. Data can be removed without warning due to dubious reasons or regional censorship policies. - -A decentralized service can reside on multiple machines, owned by different individuals, companies or organization. With federation protocols those instances can interact and form one network of many nodes (= servers hosting similar services). One might be able to shut down one node but never the entire network. In such a setup censorship is practically impossible. - -Think of how we use E-mail; you can choose any service provider or set up your own, and still exchange emails with people using another email provider. E-mail is built upon a decentralized and federated protocol. - -These two principals, together, sets up the backdrop for a huge network that depends on a rather simple infrastructure and relatively low costs. Any machine can become a server and be an equal participant in the network. From a small desktop computer at your home to a dedicated server or racks with multiple servers. This approach provides the possibility to create the biggest user owned global network - just as the Internet was intended to be. - -We do not wish for Disroot to become one centralized entity but rather a part of a larger community - one node out of many. We hope others will be inspired to create more projects with similar intentions. - ---- - -![](about-networks.jpg) - -## Privacy - -mastodon.ar.al/media/8w8o5hVTYHH6Mqyz7YM https://mastodon.ar.al/media/hjF-61Z0ffmibx_MWOE https://mastodon.ar.al/media/YH2ZN0xNguMn2Kndx58 - nice relevant text - -Software can be created and shaped into anything. Every button, every color and every link that we see and use on the web was put there by someone. When we use the applications provided for us, we mostly don't see - and sometimes don't care about - much of what happens behind the interface we use. We connect with other people, we store our files, organize meetings and festivals, send emails or chat for hours and it all happens magically. -In the last few decades information has become very valuable and more and more easy to collect and process. We are accustomed to being analyzed, blindly accepting terms and conditions for "our own good", trusting authorities and multi-billion dollar companies to protect our interest, while all along we are the product in their 'people farms'. - -**Own your own data:** -Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. Disroot doesn't use your data for any purpose other than allowing you to connect and use the service. -Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on Lufi service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: Never loose your password!) <--- link to password tutorial - -## Transparency and openness -At Disroot we use 100% free and open source software. This means that the source code (the way the software operates) is publicly accessible. Anyone is able to contribute improvements or adjustments to the software and it can be audited and controlled at any moment - no hidden back-doors or other malicious malware. - -We want to be fully transparent and open towards people using our services and therefor we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all disrooters.. - -![](about-trust.png) diff --git a/pages/03.services/02.email/_email-clients/2col-right.md b/pages/03.services/02.email/_email-clients/2col-left.md similarity index 97% rename from pages/03.services/02.email/_email-clients/2col-right.md rename to pages/03.services/02.email/_email-clients/2col-left.md index f647d4c2..f42bb246 100644 --- a/pages/03.services/02.email/_email-clients/2col-right.md +++ b/pages/03.services/02.email/_email-clients/2col-left.md @@ -5,10 +5,6 @@ fontcolor: '#7A7A7A' text_align: left --- -## Mail client setup - ---- - The best email experience is through somewhat forgotten native email clients. There is plenty of E-mail clients for desktop or mobile devices, using those is usually much more convenient then login in to the web-client every time. Below we mention just a few, but similar configuration applies to most of email clients out there: @@ -18,3 +14,7 @@ Below we mention just a few, but similar configuration applies to most of email Check our [howto page](https://howto.disroot.org/email/email-clients) dedicated to all email clients. *Check the settings on top of this page to set up your Disroot email on your device. These settings are standard information that tells your email client how to reach Disroot's email server.* + +--- + +## Mail Clients diff --git a/pages/03.services/02.email/_email-webmail/2col-right.md b/pages/03.services/02.email/_email-webmail/2col-right.md index 4afefb4b..67a1bf31 100644 --- a/pages/03.services/02.email/_email-webmail/2col-right.md +++ b/pages/03.services/02.email/_email-webmail/2col-right.md @@ -12,12 +12,12 @@ fontcolor: '#7A7A7A' RainLoop is a modern approach to web-mail. Looking fresh and simple, yet provides you with most of the features one could expect from web-mail: *Please be aware that this is a server side encryption, which means you don't have control on your secret key. This is not as safe as using desktop email client, such as Thunderbird, with local encryption. But then again, it is better than not using any encryption at all...* diff --git a/pages/03.services/03.nextcloud/_nextcloud-share/2col-left.md b/pages/03.services/03.nextcloud/_nextcloud-share/2col-left.md index 91f4dd22..2f53906d 100644 --- a/pages/03.services/03.nextcloud/_nextcloud-share/2col-left.md +++ b/pages/03.services/03.nextcloud/_nextcloud-share/2col-left.md @@ -4,7 +4,8 @@ title: 'Nextcloud Sharing' ## Sharing and access control - The easy web interface allows you to share files with other users within disroot, to create and send password protected public links, to let others upload files to your cloud and to get notifications on your phone and desktop when a user on another cloud server shares files directly with you. And you can do all these things from the desktop or mobile clients, too. +The easy web interface allows you to share files with other users within disroot, to create and send password protected public links, to let others upload files to your cloud and to get notifications on your phone and desktop when a user on another cloud server shares files directly with you. And you can do all these things from the desktop or mobile clients, too. + --- ![](nextcloud-files-comments.png?lightbox=1024) diff --git a/pages/03.services/03.nextcloud/_nextcloud/2col-right.md b/pages/03.services/03.nextcloud/_nextcloud/2col-right.md index 8f24be73..bd985cd0 100644 --- a/pages/03.services/03.nextcloud/_nextcloud/2col-right.md +++ b/pages/03.services/03.nextcloud/_nextcloud/2col-right.md @@ -17,3 +17,10 @@ It offers safe, secure, and compliant sharing solution based on standards compat Most importantly, all your data that is stored on our Nextcloud instance is encrypted! This means that no one is able to see the content of your files if not explicitly allowed by you. Not even the system administrators. ##### Currently we offer 4GB FREE account for anyone. If you need more space please get in [contact](https://disroot.org/contact/) with us. ##### + + +[https://cloud.disroot.org](https://cloud.disroot.org) + +Project Homepage: "[https://nextcloud.com](https://nextcloud.com)" + +[Source code](https://github.com/nextcloud/server) diff --git a/pages/03.services/04.diaspora/_diaspora/2col-right.md b/pages/03.services/04.diaspora/_diaspora/2col-right.md index 52c38255..e194ea88 100644 --- a/pages/03.services/04.diaspora/_diaspora/2col-right.md +++ b/pages/03.services/04.diaspora/_diaspora/2col-right.md @@ -20,3 +20,5 @@ Diaspora consists of independently owned pods (servers) that form a network. Dis [https://pod.disroot.org](https://pod.disroot.org) Project Homepage: [https://diasporafoundation.org](https://diasporafoundation.org) + +[Source code](https://github.com/diaspora/) diff --git a/pages/03.services/05.forum/_forum/2col-right.md b/pages/03.services/05.forum/_forum/2col-right.md index 48bc6fd9..93d59b41 100644 --- a/pages/03.services/05.forum/_forum/2col-right.md +++ b/pages/03.services/05.forum/_forum/2col-right.md @@ -1,5 +1,5 @@ --- -title: Nextcloud +title: Discourse bgcolor: '#FFF' fontcolor: '#7A7A7A' body_classes: modular @@ -9,7 +9,7 @@ body_classes: modular Log in --- -![](forum_logo.jpeg) +![](discourse_logo.jpeg) A Modern approach to discussion forums. @@ -20,5 +20,9 @@ It works as: - **a discussion forum** - **a long-form chat room** + https://forum.disroot.org + Project Homepage: http://discourse.org + +[Source code](https://github.com/discourse/discourse) diff --git a/pages/03.services/05.forum/_forum/Nextcloud_Logo.png b/pages/03.services/05.forum/_forum/Nextcloud_Logo.png deleted file mode 100644 index ca07899746facae95415e8dc9d665d9455c8c7f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16568 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 O2ayz&6R8%`_x~R|1hqf_ diff --git a/pages/03.services/06.matrix/_matrix/2col-right.md b/pages/03.services/06.matrix/_matrix/2col-right.md index fffc96bb..68eebe0a 100644 --- a/pages/03.services/06.matrix/_matrix/2col-right.md +++ b/pages/03.services/06.matrix/_matrix/2col-right.md @@ -14,5 +14,9 @@ body_classes: modular Communicate with your friends using a standardized, open and federated chat protocol with the ability to encrypt your communication. Matrix is a network of servers providing chat and video/audio call solution for thousands of people across multiple servers. Just like XMPP, with matrix you are not bound to one service provider, contrary to services such as whatsapp, skype, signal, slack and many others. In fact, the main idea behind matrix is to create platform where all people can communicate with each other regardless to their communicator of choice. Matrix is still a young project but it is developing rapidly. -https://chat.disroot.org -Project homepage: http://matrix.org + +[https://chat.disroot.org](https://chat.disroot.org) + +Project homepage: [http://matrix.org](http://matrix.org) + +[Source code](https://github.com/matrix-org/synapse) diff --git a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.md b/pages/03.services/07.xmpp/_xmpp-clients/2col-right.md index 7db8aec4..811e9c07 100644 --- a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.md +++ b/pages/03.services/07.xmpp/_xmpp-clients/2col-right.md @@ -11,10 +11,12 @@ text_align: left There is a lot of desktop/web/mobile clients to choose from. You can pick the one you like the best. [https://xmpp.org/software/clients.html](https://xmpp.org/software/clients.html) - - **pidgin** - multiplaform - - **gajim** - multiplatform - - **dino** - linux - - **conversations** - Android - - **sailfishOS chat** - sailfishOS - - **Adium** - MacOS - - **ChatSecure** - iOS/Android +
    +
  • **pidgin** - multiplaform
    • +
  • **gajim** - multiplatform
    • +
  • **dino** - linux
    • +
  • **conversations** - Android
    • +
  • **sailfishOS chat** - sailfishOS
    • +
  • **Adium** - MacOS
    • +
  • **ChatSecure** - iOS/Android
    • +
diff --git a/pages/03.services/07.xmpp/_xmpp-modules/3col.md b/pages/03.services/07.xmpp/_xmpp-modules/3col.md index 6e5266b7..3ee943fb 100644 --- a/pages/03.services/07.xmpp/_xmpp-modules/3col.md +++ b/pages/03.services/07.xmpp/_xmpp-modules/3col.md @@ -5,35 +5,38 @@ fontcolor: '#7A7A7A' text_align: left --- -* "**roster**"; -- Allow users to have a roster. Recommended 😉 -* "**saslauth**"; -- Authentication for clients and servers. -* "**tls**"; -- Add support for secure TLS on c2s/s2s connections -* "**dialback**"; -- s2s dialback support -* "**disco**"; -- Service discovery -* "**bosh**"; -- xmpp over http -* "**muc**"; -- Multi user Chat (chatrooms) -* "**http_upload**"; -- upload files via http (file will be deleted after 7 days) +
    +
  • "**roster**"; -- Allow users to have a roster. Recommended 😉
    • +
  • "**saslauth**"; -- Authentication for clients and servers.
    • +
  • "**tls**"; -- Add support for secure TLS on c2s/s2s connections
    • +
  • "**dialback**"; -- s2s dialback support
    • +
  • "**disco**"; -- Service discovery
    • +
  • "**bosh**"; -- xmpp over http
    • +
  • "**muc**"; -- Multi user Chat (chatrooms)
    • +
  • "**http_upload**"; -- upload files via http (file will be deleted after 7 days)
    • +
--- - -* "**private**"; -- Private XML storage (for room bookmarks, etc.) -* "**vcard**"; -- Allow users to set vCards -* "**privacy**"; -- Support privacy lists -* "**compression**"; -- Stream compression -* "**offline**"; -- Store offline messages. -* "**version**"; -- Replies to server version requests -* "**uptime**"; -- Report how long server has been running -* "**time**"; -- Let others know the time here on this server -* "**ping**"; -- Replies to XMPP pings with pongs -* "**pep**"; -- Enables users to publish their mood, activity, playing music and more +
    +
  • "**private**"; -- Private XML storage (for room bookmarks, etc.)
    • +
  • "**vcard**"; -- Allow users to set vCards
    • +
  • "**privacy**"; -- Support privacy lists
    • +
  • "**compression**"; -- Stream compression
    • +
  • "**offline**"; -- Store offline messages.
    • +
  • "**version**"; -- Replies to server version requests
    • +
  • "**uptime**"; -- Report how long server has been running
    • +
  • "**time**"; -- Let others know the time here on this server
    • +
  • "**ping**"; -- Replies to XMPP pings with pongs
    • +
  • "**pep**"; -- Enables users to publish their mood, activity, playing music and more
    • --- - -* "**carbons**"; -- Allow sending messages to multiple devices -* "**carbons_adhoc**"; -* "**carbons_copies**"; -* "**smacks**"; -- Stream Management -* "**csi**"; -- Implements Client State Indication -* "**throttle_presence**"; -- see https://modules.prosody.im/mod_throttle_presence.html -* "**announce**"; -- Send announcement to all online users -* "**motd**"; -- Send a message to users when they log in +
      +
    • "**carbons**"; -- Allow sending messages to multiple devices
      • +
    • "**carbons_adhoc**";
      • +
    • "**carbons_copies**";
      • +
    • "**smacks**"; -- Stream Management
      • +
    • "**csi**"; -- Implements Client State Indication
      • +
    • "**throttle_presence**"; -- see https://modules.prosody.im/mod_throttle_presence.html
      • +
    • "**announce**"; -- Send announcement to all online users
      • +
    • "**motd**"; -- Send a message to users when they log in
      • +
    diff --git a/pages/03.services/07.xmpp/_xmpp/2col-right.md b/pages/03.services/07.xmpp/_xmpp/2col-right.md index 734c792f..c8d787ab 100644 --- a/pages/03.services/07.xmpp/_xmpp/2col-right.md +++ b/pages/03.services/07.xmpp/_xmpp/2col-right.md @@ -14,4 +14,7 @@ body_classes: modular Communicate with your friends using a standardized, open and federated chat protocol, with the ability to encrypt your communication with OMEMO protocol (based on encryption method also used by services such as Signal and Matrix). With XMPP you are not bound to one service provider (e.g. Disroot XMPP server) but can freely communicate with contacts from other XMPP servers, just like you would communicate between different email servers. + Project homepage: [https://prosody.im](https://prosody.im) + +[Source code](http://hg.prosody.im/) diff --git a/pages/03.services/08.pads/_pads/2col-right.md b/pages/03.services/08.pads/_pads/2col-right.md index d0513976..8910b73a 100644 --- a/pages/03.services/08.pads/_pads/2col-right.md +++ b/pages/03.services/08.pads/_pads/2col-right.md @@ -17,11 +17,20 @@ Etherpad allows you to edit documents collaboratively in real-time directly in t [https://pad.disroot.org](https://pad.disroot.org) + Project homepage: [http://etherpad.org](http://etherpad.org) +[Source code](https://github.com/ether/etherpad-lite) + + ![](ethercalc.png) ## A collaborative web spreadsheet. Your data is saved on the web, and people can edit the same document at the same time. Everybody's changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions and more! + +[https://calc.disroot.org](https://calc.disroot.org) + +Project Homepage: [https://ethercalc.net](https://ethercalc.net) +[Source code](https://github.com/audreyt/ethercalc) diff --git a/pages/03.services/09.bin/_bin/2col-right.md b/pages/03.services/09.bin/_bin/2col-right.md index d9d2dd73..51ded5df 100644 --- a/pages/03.services/09.bin/_bin/2col-right.md +++ b/pages/03.services/09.bin/_bin/2col-right.md @@ -14,6 +14,7 @@ body_classes: modular PrivateBin is a minimalist, open-source online pastebin and discussion board. The data of every pastebin is encrypted/decrypted in the browser so that the server has zero knowledge of hosted data. -https://bin.disroot.org +[https://bin.disroot.org](https://bin.disroot.org) -Project Homepage: https://privatebin.info/ +Project Homepage: [https://privatebin.info/](https://privatebin.info/) +[Source code](https://github.com/PrivateBin/PrivateBin) diff --git a/pages/04.contact/_contact/2col-left.md b/pages/04.contact/_contact/2col-left.md index c1a8aa46..b98f60a6 100644 --- a/pages/04.contact/_contact/2col-left.md +++ b/pages/04.contact/_contact/2col-left.md @@ -9,12 +9,9 @@ text_align: left If you would like to send us a feedback, have a question, would like to get in touch, or simply bitch about our poor services and support: -**Email:** info@disroot.org|safe_email
    +**Email:** "info@disroot.org"|safe_email
    **[Matrix]:** [#disroot:disroot.org](https://chat.disroot.org/#/room/#disroot:disroot.org) or directly via riot or other matrix clients
    **XMPP:** disroot@chat.disroot.org
    **IRC:** #disroot on irc.freenode.net
    **Diaspora:** use hashtag #disroot
    **Mastodon:** https://social.weho.st/@disroot
    - -If you have a feature request, an idea, feedback, a question, or would like to report a bug or other issue you have with your disroot account, -check our [roadmap page](https://disroot.org/roadmap/). diff --git a/pages/04.contact/_contact/fullbar.md b/pages/04.contact/_contact/fullbar.md deleted file mode 100644 index c1a8aa46..00000000 --- a/pages/04.contact/_contact/fullbar.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Contact -bgcolor: '#1F5C60' -fontcolor: '#FFFFFF' -text_align: left ---- - -# How to contact us? - -If you would like to send us a feedback, have a question, would like to get in touch, or simply bitch about our poor services and support: - -**Email:** info@disroot.org|safe_email
    -**[Matrix]:** [#disroot:disroot.org](https://chat.disroot.org/#/room/#disroot:disroot.org) or directly via riot or other matrix clients
    -**XMPP:** disroot@chat.disroot.org
    -**IRC:** #disroot on irc.freenode.net
    -**Diaspora:** use hashtag #disroot
    -**Mastodon:** https://social.weho.st/@disroot
    - -If you have a feature request, an idea, feedback, a question, or would like to report a bug or other issue you have with your disroot account, -check our [roadmap page](https://disroot.org/roadmap/). diff --git a/pages/06.donate/_donate/2col-right.md b/pages/06.donate/_donate/2col-right.md index 941ce606..70b93261 100644 --- a/pages/06.donate/_donate/2col-right.md +++ b/pages/06.donate/_donate/2col-right.md @@ -9,7 +9,8 @@ fontcolor: '#FFF' --- -There's no such thing as a free service on the Internet! Whether it's the people giving their time to maintain the software or paying for hardware running it, the electricity used to power the machines or the hosting space in the data-center. With the big popular companies that give "free" service, it is most likely your personal user data that is paying the price. +There's no such thing as a free service on the Internet! Whether it's the people giving their time to maintain the software or paying for hardware running it, the electricity used to power the machines or the hosting space in the data-center. With the big popular companies that give "free" service, it is most likely your personal user data that is paying the price. Imagine a scope of their operation, the amount of staff, and hardware needed to serve billions of users world-wide. They aren't charity, and yet provide "free" service... disroot.org is run by volunteers and offers all the services free of charge. We do not collect information to sell to advertising companies or government agencies. Thus we must rely on donations and support from users of the services and the community. If you would like to keep the project going and create space for potential new users, you can use any of the methods below to make a financial contribution. + *Remember, any amount of money counts! If all disrooters would buy us a cup of coffee each month, we could run this service without any financial issues.*