diff --git a/pages/02.about/_about-what/about-networks.jpg b/pages/02.about/_about-what/about-networks.jpg new file mode 100644 index 00000000..31d05b40 Binary files /dev/null and b/pages/02.about/_about-what/about-networks.jpg differ diff --git a/pages/02.about/_about-what/about-organize.jpg b/pages/02.about/_about-what/about-organize.jpg new file mode 100644 index 00000000..577f577f Binary files /dev/null and b/pages/02.about/_about-what/about-organize.jpg differ diff --git a/pages/02.about/_about-what/about-trust.png b/pages/02.about/_about-what/about-trust.png new file mode 100644 index 00000000..5c2e5e8d Binary files /dev/null and b/pages/02.about/_about-what/about-trust.png differ diff --git a/pages/02.about/_about-what/fullbar.md b/pages/02.about/_about-what/fullbar.md new file mode 100644 index 00000000..19f6edc2 --- /dev/null +++ b/pages/02.about/_about-what/fullbar.md @@ -0,0 +1,39 @@ +--- +title: 'About us' +bgcolor: '#8EB726' +fontcolor: '#FFF' +text_align: center +--- + +![](about-organize.jpg) + +## Federation and Decentralization + +With federation we can connect to other nodes (= servers hosting similar services) and interact with them. Just like the way you use email, you can choose your service provider or set up your own, and still exchange emails with a friend using another email provider. This sets up the backdrop for a huge network that depends on a rather simple infrastructure and very low costs. Any machine can become a server and be an equal participant of that network. From a small desktop computer at your home to a dedicated server or racks with multiple servers. This approach gives a possibility to create the biggest truly independent, user owned network. + +Most social networks are run from a centralized servers owned and run by a corporation. These store all the private data of their users. This information can be lost or hacked, and like any system with a bottleneck, any problem at the central servers can make the whole network run very slowly, or not at all. It is also more easy for governments or other 3rd parties to “listen in.” and impose censorship. + +With federated and decentralized networks of servers, censorship of any kind is practically impossible. Shutting down one server does not shutdown the entire network. + +We do not wish for Disroot to become one centralized project but a part of a larger community. One node of many. We hope others will be inspired to create more projects with similar bundles of services. + +--- + +![](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. Think about it for a few minutes. Every button, every color and every link that we see and use on the web was put there by someone. As non technical users we 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. +For a few decades now information has been more and more important and one of the reasons is because it is so damn easy to collect it and use it at will. We, as users, are used to being analyzed, accepting terms and conditions for "our own good", pleading to authority to solve our problems (and to coincidentally justify rules that are forced onto us). We all have been pushed and locked in by big corporations offering their "free services" while those companies generate gigantic profits off their users data. +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 sets us apart form corporate/commercial software out there. [something about open source or audits] +We want to be fully transparent and open towards our users and therefor publish information about the development of the project and he financial status. + +![](about-trust.png) diff --git a/pages/02.about/_another/fullbar.md b/pages/02.about/_another/fullbar.md deleted file mode 100644 index 220a1488..00000000 --- a/pages/02.about/_another/fullbar.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: another -fontcolor: '#ff0000' -text_align: right ---- - -lol \ No newline at end of file diff --git a/pages/02.about/_empty-bar/fullbar.md b/pages/02.about/_empty-bar/fullbar.md new file mode 100644 index 00000000..3d0ee89b --- /dev/null +++ b/pages/02.about/_empty-bar/fullbar.md @@ -0,0 +1,6 @@ +--- +title: 'Empty Bar' +bgcolor: '#8EB726' +fontcolor: '#FFF' +text_align: center +--- diff --git a/pages/02.about/_fullbar/fullbar.md b/pages/02.about/_fullbar/fullbar.md deleted file mode 100644 index 1b2a613d..00000000 --- a/pages/02.about/_fullbar/fullbar.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: fullbar -bgcolor: '#b9a2ab' -fontcolor: '#FFFFFF' -text_align: left -section_id: highlights ---- - -Discourse Highlight Features: \ No newline at end of file diff --git a/pages/02.about/_who-and-why/2col-right.md b/pages/02.about/_who-and-why/2col-right.md new file mode 100644 index 00000000..333979f6 --- /dev/null +++ b/pages/02.about/_who-and-why/2col-right.md @@ -0,0 +1,19 @@ +--- +title: Email +bgcolor: '#FFFFFF' +fontcolor: '#7A7A7A' +body_classes: modular +--- + +Disroot is maintained by a small group of volunteers based in Amsterdam. + + +We originally created Disroot out of personal need = we were looking for software that we could use to communicate, share and organize within our community. Most of the available solutions were missing the key elements that we find so important; Our tools should be **open**, **decentralized**, **federated** and respectful towards **freedom** and **privacy**. + +We searched and we found some really good projects out there. projects that should be available to anyone who values these principals. We chose few to bundle together for public use; Email, forum, file sharing, chat, collaborative text editing and a social network. + +However, we don't seek to be your everyday sterile service provider. By running Disroot we want to give a hand to turn the tables on how users typically interact on the web. We want to encourage people to use those services - may it be on our platform or on another (or just host your own) - with the goal of forming a network where users can easily interact with one another rather then being closed off in one eco-system controlled mainly by one company. + +--- + +![](about-revolution.jpeg) diff --git a/pages/02.about/_who-and-why/about-revolution.jpeg b/pages/02.about/_who-and-why/about-revolution.jpeg new file mode 100644 index 00000000..deb11ee7 Binary files /dev/null and b/pages/02.about/_who-and-why/about-revolution.jpeg differ diff --git a/pages/02.about/about-banner.jpeg b/pages/02.about/about-banner.jpeg new file mode 100644 index 00000000..055a0aad Binary files /dev/null and b/pages/02.about/about-banner.jpeg differ diff --git a/pages/02.about/modular.md b/pages/02.about/modular.md index 9ac3bb43..9bc18a47 100644 --- a/pages/02.about/modular.md +++ b/pages/02.about/modular.md @@ -1,11 +1,14 @@ --- -title: test007 -header_image: 'https://grav.disroot.org/user/pages/02.test007/uHCfuzi.jpg' +title: About us content: items: '@self.modular' order: - by: date - dir: desc + by: default + dir: asc + custom: + - _about-who-and-why + - _about-what + - _empty-bar body_classes: modular +header_image: about-banner.jpeg --- - diff --git a/pages/02.about/uHCfuzi.jpg b/pages/02.about/uHCfuzi.jpg deleted file mode 100644 index 13df092d..00000000 Binary files a/pages/02.about/uHCfuzi.jpg and /dev/null differ diff --git a/pages/03.services/12.polls/_poll-results/2col-left.md b/pages/03.services/12.polls/_poll-results/2col-left.md index e2391a5c..80b4a59b 100644 --- a/pages/03.services/12.polls/_poll-results/2col-left.md +++ b/pages/03.services/12.polls/_poll-results/2col-left.md @@ -5,7 +5,7 @@ fontcolor: '#7A7A7A' text_align: left --- -![](poll_result.gif) +![](poll_results.gif) --- diff --git a/pages/03.services/12.polls/_poll-results/2col-right.md b/pages/03.services/12.polls/_poll-results/2col-right.md new file mode 100644 index 00000000..e2391a5c --- /dev/null +++ b/pages/03.services/12.polls/_poll-results/2col-right.md @@ -0,0 +1,12 @@ +--- +title: 'Create poll' +bgcolor: '#FFF' +fontcolor: '#7A7A7A' +text_align: left +--- + +![](poll_result.gif) + +--- + +# View results