Compare commits

...

809 commits

Author SHA1 Message Date
meaz c4d06c4921 TOS translation date (#484)
To be merged only once Fede's PR on TOS is merged

Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Reviewed-on: Disroot/Website#484
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2024-06-09 15:44:30 +02:00
meaz 2ce74b98ae update forgotten DE tor link to libretranslate (#487)
Reviewed-on: Disroot/Website#487
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2024-06-09 09:28:59 +02:00
muppeth f80d234852 Onion Libretranslate (#485) (#486)
fixed TOR page for libretranslate

Reviewed-on: Disroot/Website#485
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>

Reviewed-on: Disroot/Website#486
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2024-06-06 22:23:08 +02:00
muppeth 9071e58102 Monal link update (#483)
Reviewed-on: Disroot/Website#483
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2024-05-12 23:23:29 +02:00
floss4good 700cda9fb6 style fixes for some service pages (#482)
- fix: font color of first section from Audio, Calls and Forgejo service pages
- make background color all white for CryptPad sheet and diagram logos

Reviewed-on: Disroot/Website#482
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: floss4good <floss4good@disroot.org>
Co-committed-by: floss4good <floss4good@disroot.org>
2024-04-26 14:11:17 +02:00
floss4good 4a2b24a7ee small fixes and adjustments for service pages (#481)
fix: Nextcloud bookmarks logo path for DE service page
fix: Forgejo screenshots paths for DE service page
fix: 'CryptPad features' layout by including the _cryptpad-diagram partial
fix: some CryptPad spellings
fix: include missing partial for DE Nextcloud service page
fix: remove some pictures that are not used
Reviewed-on: Disroot/Website#481
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: floss4good <floss4good@disroot.org>
Co-committed-by: floss4good <floss4good@disroot.org>
2024-04-26 05:05:10 +02:00
meaz ec69c7d177 update and cleanup of pages (#479)
See Disroot/Disroot-Project#842

Co-authored-by: fede <fede@disroot.org>
Reviewed-on: Disroot/Website#479
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2024-04-25 11:10:40 +02:00
Fede.- a952daf46c Typo · Fixed (#478)
Fixed small typo on SearxNG service page

Reviewed-on: Disroot/Website#478
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-committed-by: fede <fede@disroot.org>
2024-04-23 14:18:15 +02:00
meaz c4750c9500 replace converse by movim (#477)
Fix Disroot/Disroot-Project#864

Reviewed-on: Disroot/Website#477
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2024-04-16 14:59:48 +02:00
antilopa db284940e7 update overview graphs (#476)
Reviewed-on: Disroot/Website#476
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>
2024-04-10 20:22:45 +00:00
Jeremy Baxter 3bdc0b40a5 Improve language in the English pages for email, git hosting and the contact page (#473)
Let me know if there's anything that could be written better. <3

Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#473
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Jeremy Baxter <jtbx@disroot.org>
Co-committed-by: Jeremy Baxter <jtbx@disroot.org>
2024-03-24 15:57:58 +00:00
Fede.- ec8f91cafd Spanish translation of blogpost 24.03 (#475)
Spanish translation of blogpost 24.03

Reviewed-on: Disroot/Website#475
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-committed-by: fede <fede@disroot.org>
2024-03-18 17:27:56 +00:00
l3o e5f5a68c49 it translation of disnews 24.03 (#474)
Reviewed-on: Disroot/Website#474
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Co-committed-by: l3o <l3o@disroot.org>
2024-03-15 15:59:24 +00:00
muppeth 3f4046c356 Disnews24 03 (#472)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#472
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2024-03-13 23:14:22 +00:00
floss4good 76002e91f8 fix: TOR URLs for Calls and Git service pages (#470)
Currently, if you go to http://j4dhkkxfcsvzvh3p5djkmuehhgd6t6l7wmzih6b4ss744hegwkiae7ad.onion/en/tor the URLs for Calls and Git service pages have an extra `'` at the end (because the opening apostrophe is missing in the source file), leading to 404 errors when accessing those URLs.
This PR should fix the issue.

Reviewed-on: Disroot/Website#470
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: floss4good <floss4good@disroot.org>
Co-committed-by: floss4good <floss4good@disroot.org>
2024-02-29 12:07:34 +00:00
avg_joe d9d48f08bd DE scribe translation (#469)
scribe pages translation to DE

bedda late than never :)

Reviewed-on: Disroot/Website#469
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-committed-by: avg_joe <jh@disroot.org>
2024-02-25 20:57:14 +00:00
antilopa f43438412a reports updated (#468)
Reviewed-on: Disroot/Website#468
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>
2024-02-23 15:44:05 +00:00
meaz 5f78bd908a scribe pages (#464)
Everything is ready, we need to:

- [x] Agree on texts
- [ ] Agree on banner

Then
- [x] FR
- [x] SP
- [ ] GE
- [x] IT

Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Reviewed-on: Disroot/Website#464
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2024-02-04 14:52:07 +00:00
Fede.- 322c113efe Website: Complete Spanish translation fixes and updates · January 2024 (#467)
Complete revision and update of the Spanish translation of the website.

Reviewed-on: Disroot/Website#467
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-committed-by: fede <fede@disroot.org>
2024-01-27 19:13:50 +00:00
meaz 94f7127e60 Remove mumble_web (#462)
Reviewed-on: Disroot/Website#462
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2024-01-09 16:10:36 +00:00
muppeth 0f4d997a16 Fix formatting for storage request form in Italian (#466)
Reviewed-on: Disroot/Website#466
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2024-01-09 10:27:43 +00:00
antilopa 7efac06192 overview_dec_2023 (#465)
Reviewed-on: Disroot/Website#465
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>
2024-01-07 13:29:44 +00:00
meaz 64a1431157 change path from translate to libretranslate (#463)
Reviewed-on: Disroot/Website#463
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2023-12-14 13:16:40 +00:00
meaz eb019067c3 add libretranslate info (#453)
- [x] Create a logo for this and add it to asset repo (@antilopa )
- [x] Add a banner image
- [x] French translation
- [x] German translation
- [x] Italian translation
- [x] Spanish translation

Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: kitleopold <kitleopold@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#453
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2023-12-01 12:47:49 +00:00
Fede.- 204d960df4 Disnews Spanish translation (#461)
Disnews #11 Spanish translation.

Reviewed-on: Disroot/Website#461
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-committed-by: fede <fede@disroot.org>
2023-11-25 05:48:23 +00:00
avg_joe 4104470a6e
Merge commit '8593f63d5ca92bd7673b404888013798af18311d' 2023-11-20 22:32:22 +01:00
avg_joe 8593f63d5c
add cc-by-sa license 2023-11-20 19:51:02 +01:00
l3o 093467819c italan translation Disnews11 (#459)
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#459
Co-authored-by: l3o <l3o@disroot.org>
Co-committed-by: l3o <l3o@disroot.org>
2023-11-20 13:58:58 +00:00
meaz d90fc50970 change profanity website link (#458)
Reviewed-on: Disroot/Website#458
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-11-20 13:57:57 +00:00
muppeth 0e3d8cb328 Disnews11 (#457)
Reviewed-on: Disroot/Website#457
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2023-11-20 10:20:48 +00:00
muppeth 9c7743158e 697 - fix broken links on faq page (#456)
Reviewed-on: Disroot/Website#456
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-committed-by: muppeth <muppeth@disroot.org>
2023-11-13 22:55:25 +00:00
antilopa cadde76e04 financial overview aug - oct (#455)
Reviewed-on: Disroot/Website#455
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>
2023-11-13 15:29:56 +00:00
avg_joe ccbc18d041
de soft hyphen goals 2023-11-04 14:33:33 +01:00
kitleopold 6fab4fd1c6 Updated Russian translation of the Community section (#451)
Updated the Russian translation of the Community section.

First of all, I replaced the links for tracking current workflow, future plans and bugs from the board to the git repository.

Made a few minor edits to the text that I thought were better.

And lastly, I have one question. I left the words/word combination "**Disroot Project**" and "**Disroot-Project**" untranslated because I consider these words to be proper names that don't require translation (as well as the single word **Disroot**). I also think that these words are clear without translation, because the word "**Project**" is very similar to the Russian word "**Проект**" which is a direct translation. Can you please tell me if the words "**Disroot Project**"/"**Disroot-Project**" are proper names and if not?

Thank you.

Reviewed-on: Disroot/Website#451
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: kitleopold <kitleopold@disroot.org>
Co-committed-by: kitleopold <kitleopold@disroot.org>
2023-11-04 07:24:33 +00:00
avg_joe 2ec21a0084 update delimter info (#450)
solves Disroot/Disroot-Project#671
@fede @meaz @kitleopold @l3o please check and fix my translations :)

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#450
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-committed-by: avg_joe <jh@disroot.org>
2023-11-03 20:58:07 +00:00
kitleopold cba30aeffb Updated Russian translation of the About section (#449)
Reviewed-on: Disroot/Website#449
Co-authored-by: kitleopold <kitleopold@disroot.org>
Co-committed-by: kitleopold <kitleopold@disroot.org>
2023-11-02 08:14:50 +00:00
meaz 4f2c2fb4d0 crypto: add monero and translation (#446)
See Disroot/Disroot-Project#630

@avg_joe @fede @l3o please could you make sure this is translated correctly?

Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: Disroot/Website#446
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-10-23 13:49:07 +00:00
Sprite e0485b707c Slight changes & refactors for README's (#448)
./README.md
- Added clear link to vagrant README
- Added headers

./vagrant/README.md
- Added syntax highlighting
- Added cd & relative clones in installation
- Fixed typo (requirements 2. virtualbox)
- Merged some code blocks

Reviewed-on: Disroot/Website#448
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Sprite <compromisedneopetspassword@proton.me>
Co-committed-by: Sprite <compromisedneopetspassword@proton.me>
2023-10-23 13:48:27 +00:00
antilopa a89ac4b9ea chat_page (#438)
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#438
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>
2023-10-19 14:15:29 +00:00
meaz 56aac3ad57 Cryptpad extra storage (#447)
We decided to give the possibility to add extra storage so I've updated:
- Forms (but @antilopa could you check that? Can I just add the `name: cryptpadkey` so that we will get the public key of users?)
- Cryptpad page
- Perks page

@avg_joe @fede @l3o as usual I need you to check what I translated, and what I didn't translate also :)

- [x] Italian
- [ ] Spanish
- [x] German

Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: Disroot/Website#447
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
2023-10-03 21:14:29 +00:00
muppeth 001ca12e15 New fedi - switched links to fedi account from wehost to nixnet (#445)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#445
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-08-17 03:16:57 +00:00
antilopa dd39fd444f Fiancial overview update June July 2023 (#444)
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#444
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-08-15 05:17:03 +00:00
meaz def3f91b0e remove link to forum (#442)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#442
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-08-12 18:05:41 +00:00
meaz 7a5657f12e changelog: keep the _main folder (#441)
For the grav repo, I need to have the `_main` folder to exist so that I can then symlink it to changelog repo. It does exist on prod, but not in the repo itself as it is in .gitignore, so when I git clone, I don't have that `_main` folder. That is why I'm removing it from parent .gitignore and adding it. But as it is empty, git doesn't want to "save" it, so I created an useless .gitignore file in it...

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#441
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-08-12 18:04:29 +00:00
meaz d91ff543fa remove link to flattr (#443)
See Disroot/Disroot-Project#615

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#443
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-08-12 17:58:49 +00:00
meaz 9f1f9b5bfe tor services list pages (#440)
![Tor Disroot.png](/attachments/dbb4c812-ee1e-4bec-a888-9f0df3124b94)

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#440
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-07-29 07:04:12 +00:00
muppeth 3528480e69 fixed onion addresses of some services that were recently moved to different proxy (#439)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#439
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-07-26 09:01:15 +00:00
l3o d15b621d8b translated the post on Threads into Italian (#437)
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#437
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2023-07-07 12:48:57 +00:00
Fede.- 01d17b4a5a Spanish typo fixed (#436)
Added one missing word.

Reviewed-on: Disroot/Website#436
2023-07-07 01:11:11 +00:00
muppeth 3c6460f75e Our position on new Meta ThreaTs (#435)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Reviewed-on: Disroot/Website#435
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-07-06 23:14:41 +00:00
antilopa d32cb36648 financial overview update apr may (#434)
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#434
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-06-29 07:08:55 +00:00
muppeth 6594958b4f added note about tls1.1 (#433)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#433
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-06-19 21:10:40 +00:00
l3o 7f64a8b093 corrected apostrophe error (#432)
In the title of the post in Italian I used the wrong character for the apostrophe which caused an error in the frontmatter.
Sorry but I just noticed it now:/
This pull request fixes this error

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#432
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2023-06-17 16:54:39 +00:00
Fede.- 8e1aba534d DisNews#10 · Spanish translation (#429)
Spanish translation of the blogpost #10

Co-authored-by: fede <fede@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-on: Disroot/Website#429
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Co-committed-by: Fede.- <fede@no-reply@disroot.org>
2023-06-15 11:52:20 +00:00
l3o 5142c521eb translated disnews #10 in italian (#430)
Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-on: Disroot/Website#430
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2023-06-15 11:51:59 +00:00
muppeth 425a63120b switched to bette rimage for blog post. Solidarity with polish women (#431)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#431
2023-06-15 11:51:32 +00:00
muppeth 2f269032b9 Disnews #10 (#428)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#428
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-06-13 21:55:46 +00:00
hairy-tortoise 62553321fb Added missing whitespace (#427)
Reviewed-on: Disroot/Website#427
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: hairy-tortoise <hairy-tortoise@no-reply@disroot.org>
Co-committed-by: hairy-tortoise <hairy-tortoise@no-reply@disroot.org>
2023-05-23 20:41:49 +00:00
meaz 4e42aedaa1 change btc to crypto in payment accepted in forms (#425)
See Disroot/Disroot-Project#487

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#425
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-05-09 15:27:12 +00:00
meaz 937c1a1ae3 add onion btn and update tor page with link (#424)
I used deepl to translate, so have a look and approve if that is fine with you ;)

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Reviewed-on: Disroot/Website#424
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-05-09 15:24:03 +00:00
meaz f76e0f4fbf remove mention of forum (#426)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#426
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-05-06 15:33:21 +00:00
meaz 45c4b0fbf9 Remove extra mail storage (#423)
we don't use that anymore.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#423
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-04-15 07:45:50 +00:00
antilopa c76484d331 update overview Q1 2023 (#422)
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#422
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-04-12 20:00:51 +00:00
antilopa ed844cd3b0 report2022 (#421)
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#421
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-03-30 08:47:37 +00:00
l3o 0ebc78f478 translated Disnews9 into italian (#420)
Italian translation of Disnews9

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#420
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2023-03-23 22:52:34 +00:00
muppeth d700aa731a Disnews9 (#419)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Reviewed-on: Disroot/Website#419
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-03-22 14:40:04 +00:00
meaz da60d9c437 Update last change date on TOS (#418)
I also removed 2 files that should be there as there are already in the TOS repo.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#418
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-02-26 10:42:18 +00:00
meaz d872f957ce French translation of the tor page (#416)
This is the french translation of the tor page. BTW @avg_joe and @fede , if you could do the Spanish and German ones, that would be awesome. @l3o already did the Italian one.

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Reviewed-on: Disroot/Website#416
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-02-25 17:49:10 +00:00
meaz 0c787e11e8 fix error in french form for domain linking (#417)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#417
2023-02-25 07:12:50 +00:00
l3o 0f91704996 it - Italian translation of the Tor page (#415)
Translated into Italian the page of Tor

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#415
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2023-02-24 13:31:13 +00:00
meaz bfdc9ac90d add tor page (#413)
It is a page that explains that you can access website through Tor.
It could be changed to add other tor services later, when available.

It needs this PR also: Disroot-themes/grav-theme-disroot#66

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#413
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-02-24 05:52:45 +00:00
meaz 993811d2dc change jitsi logo to the official one (#414)
see Disroot/Disroot-Project#437

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#414
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2023-02-13 06:13:53 +00:00
meaz e5206a167d fix error on forgejo link (#412)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#412
2023-02-07 15:49:51 +00:00
antilopa 5d6d16dfa7 Financial overview Dec 2022 (#411)
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#411
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@no-reply@disroot.org>
Co-committed-by: antilopa <antilopa@no-reply@disroot.org>
2023-02-05 09:57:02 +00:00
meaz caa964719b switch from gitea to forgejo (#410)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#410
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-01-24 17:46:55 +00:00
meaz 03e043352c remove taiga and forum (#407)
see Disroot/Disroot-Project#405

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#407
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-01-12 16:50:34 +00:00
meaz db051346be update akkoma page (#408)
Fixes logo + translations + change image to mangane

See here: Disroot/Disroot-Project#404

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#408
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2023-01-12 16:44:25 +00:00
Fede.- 120fe313a2 SP_Disnews (#406)
Spanish translation of DisNews #8

Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: Disroot/Website#406
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-12-28 22:05:42 +00:00
meaz 89f0a10ccf fix a couple of error on italian version (#404)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#404
2022-12-28 06:59:40 +00:00
l3o d864bdc3a3 translated into italian disnews#8 (#403)
Translated into Italian the last blog post

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#403
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-12-27 17:19:05 +00:00
muppeth bb4a8eca13 Disnews#8 (#402)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: Disroot/Website#402
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-12-27 07:00:37 +00:00
meaz 75ea9fd2e6 add missing french (#401)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#401
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-12-26 17:21:36 +00:00
meaz 57474e32ae add akkoma's page (#270)
Here is a draft for the pleroma's page. Change whatever you want!

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#270
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-12-20 10:15:50 +00:00
antilopa 0dd997976b financial overview update aug-nov (#399)
Reviewed-on: Disroot/Website#399
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-12-12 08:10:40 +00:00
Jacque Fresco f0a6bb320f lynx (#400)
# ufdfd

- [x] Disroot/Website#392

Reviewed-on: Disroot/Website#400
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Jacque Fresco <tfelypoc@no-reply@disroot.org>
Co-committed-by: Jacque Fresco <tfelypoc@no-reply@disroot.org>
2022-12-10 21:43:56 +00:00
antilopa 6853205ca6 financial overview update aug-nov 2022-12-09 08:58:50 +01:00
meaz 6e008022d7 Add info about stickers (#398)
see Disroot/Disroot-Project#362

If we agree on this, then we need translation in:

- [ ] Spanish
- [ ] German
- [x] Italian

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#398
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-11-13 15:31:05 +00:00
muppeth 6de6d51397 XMPP page - Changed info about file upload limits and MAM (#384)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#384
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-11-06 08:58:29 +00:00
l3o 170df7be2e italian translation of the post on Lacre test (#397)
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#397
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-11-05 21:06:07 +00:00
muppeth b83a97b493 Merge pull request 'Lacre Test Cancelled' (#396) from lacre_test_cancelled into master
Reviewed-on: Disroot/Website#396
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-11-04 11:01:09 +00:00
antilopa 130b2eea4b correct some spelling typos 2022-11-04 11:59:02 +01:00
muppeth c068b06dd5
lacre test cancelled 2022-11-04 11:32:40 +01:00
l3o 6eece70b6b italian translation of the post DisNews7 (#394)
I translated the DisNews7 post into Italian. See you on the 4th for the test :)

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#394
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-10-29 06:08:17 +00:00
muppeth bd27e7ca47
wrong disnews number 2022-10-27 11:28:24 +02:00
muppeth 291faa7d3f Disnews 8 - Lacre testing on Disroot (#393)
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: Disroot/Website#393
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-10-27 08:53:44 +00:00
l3o 258dedef0a italian translation of disnews6 (#388)
Italian translation of blog post disnews #6

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#388
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-09-25 18:54:08 +00:00
muppeth a71e514f2b Merge pull request 'Disnews6typo' (#387) from disnews6typo into master 2022-09-23 14:30:32 +00:00
muppeth 4250bda4a8
fixed typo in disnews6 blogpost 2022-09-23 16:29:35 +02:00
muppeth 0430572a19 disnews6 - Catchall mail for custom domain; Improving SPAM handling; Roundcube webmail (#381)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#381
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-09-22 11:27:13 +00:00
muppeth df8d449087 added catchall feature to custom domain form (#377)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#377
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-09-22 11:26:28 +00:00
avg_joe c1605a3175 WEBSITE_aktualisierung_ger (#386)
merge some laying around around changes into master

Co-authored-by: shadowsword <shadowsword@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#386
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-09-21 15:58:23 +00:00
meaz ec720de06a fix link to webmail (#385)
@avg_joe could you check the German version, I don't think the whole text is up-to-date. Thanks!

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: Disroot/Website#385
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-09-19 11:55:49 +00:00
meaz 5df93553c9 add mailvelope info (#380)
See Disroot/Disroot-Project#300 (comment)

If we agree with this, we can add other languages.

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#380
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-09-16 18:58:47 +00:00
ifsnnq5 b725050d24 Translation, grammar fixes. (#383)
Co-authored-by: ifsnnq5 <no-reply@localhost>
Reviewed-on: Disroot/Website#383
Co-authored-by: ifsnnq5 <ifsnnq5@no-reply@disroot.org>
Co-committed-by: ifsnnq5 <ifsnnq5@no-reply@disroot.org>
2022-09-05 12:33:28 +00:00
antilopa 1277687a3d Merge pull request 'update financial overview for june and july' (#382) from overview_jul_2022 into master
Reviewed-on: Disroot/Website#382
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-09-01 11:16:02 +00:00
antilopa bf2825ec80 update fiancila overview for june and july 2022-08-26 11:23:51 +02:00
meaz 3d86c01b4e Merge pull request 'remove 2FA and update other language still with RainLoop' (#379) from RC-update into master
Reviewed-on: Disroot/Website#379
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-07-29 06:10:35 +00:00
avg_joe 8bb1b71144 german - comment out 2FA 2022-07-28 17:15:03 +02:00
avg_joe 53ad6752ed german translation 2022-07-28 13:37:06 +02:00
Fede.- 54ff901bf5
RC-update · Spanish translation 2022-07-27 21:32:21 -03:00
l3o 757c46d477
it-translation Roundcube 2022-07-25 20:58:39 +02:00
meaz cc91641dac remove 2FA and update other language still with RainLoop 2022-07-25 12:50:03 +02:00
muppeth 80665cfbe3 Merge pull request 'Moved links from mail.disroot.org to webmail.disroot.org' (#378) from roundcubelinks into master
Reviewed-on: Disroot/Website#378
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-07-20 03:33:38 +00:00
muppeth debd21fbde
switched links from mail.disroot.org webmail.disrot.org 2022-07-16 10:06:18 +02:00
meaz 753b2a33dc roundcube (#144)
Change info from rainloop to roundcube

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#144
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-07-16 08:00:01 +00:00
avg_joe 7982603358 community page: change from taiga to git (#220)
- [x] English

- [x] French

- [x] Italian

- [x] German

- [ ] Spanish

Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: fede <fede@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#220
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-06-21 08:42:56 +00:00
Fede.- e1bf333553 Merge pull request 'italian translation of blog- disnews5' (#376) from it-disnews5 into master
Reviewed-on: Disroot/Website#376
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-06-17 12:33:25 +00:00
l3o aae5b3e3da
italian translation of blog- disnews5 2022-06-17 14:15:00 +02:00
Fede.- f71056e754 Merge pull request 'Disnews #5' (#374) from disnews-5 into master
Reviewed-on: Disroot/Website#374
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-06-17 10:02:56 +00:00
Fede.- 4bb46531cf Added paragraph about donations page 2022-06-17 10:02:15 +00:00
Fede.- 52b3683264 Disnews #5 2022-06-17 10:02:15 +00:00
antilopa 9a8761e888 Merge pull request 'added FOSS donations from 2021 to the graph' (#373) from foss_graph_update into master
Reviewed-on: Disroot/Website#373
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-06-16 08:17:27 +00:00
antilopa d64967dda0 added FOSS donations from 2021 to the graph 2022-06-15 11:59:30 +02:00
Fede.- ee4d635597 Merge pull request 'translated pages "new prices" into italian' (#370) from it-new-prices into master
Reviewed-on: Disroot/Website#370
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-06-14 15:42:05 +00:00
l3o 5b01c6b7f2
it translation extra storage form 2022-06-14 16:33:43 +02:00
l3o d9cf436e32
Merge branch 'master' into it-new-prices 2022-06-14 16:31:39 +02:00
antilopa a2ea13bdf5 Merge pull request 'uodate overview for may 2022' (#369) from overview_may_2022 into master
Reviewed-on: Disroot/Website#369
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-06-13 15:12:26 +00:00
meaz 9a7dcd7a55 get prices ready for all languages but italian, and translate in french (#371)
(no Italian as there is already another branch with those)

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: Disroot/Website#371
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-06-09 13:19:43 +00:00
AlanLeoni b2c24f482f
added untranslated line 2022-06-09 09:02:31 +02:00
antilopa 7cf721fa54 correction of innitial funds from 2017 2022-06-08 22:25:07 +02:00
AlanLeoni ee7a662b06
translated pages new prices into italian 2022-06-08 13:54:30 +02:00
antilopa 126c710a99 uodate overview for may 2022 2022-06-06 12:28:17 +02:00
meaz d07348c6da new prices (#351)
Set new prices:
- On service mail page
- On service cloud page
- On Perk page
- Update the form (and keep only one)

We need now:
- [ ] To agree on this (or if the look/texts have to be improved)
- [ ] To modifiy all languages (but will do that only when previous is ok)

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#351
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-06-01 15:01:22 +00:00
antilopa e4f6c89591 Merge pull request 'update to monthly overview' (#367) from overview_apr_22 into master
Reviewed-on: Disroot/Website#367
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-05-19 06:59:15 +00:00
antilopa c45d95d7c2 update to monthly overview 2022-05-18 12:04:53 +02:00
meaz 6c9171db99 fix k9mail link on clients page (#366)
see Disroot/Website#365

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#366
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-05-07 08:20:11 +00:00
l3o ee774b2b0c it-blog-snappymail (#364)
Translated the latest blog post on changing the webmail software

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#364
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-04-23 07:52:32 +00:00
muppeth e0e44b847a blog post 2022-04-snappymail (#363)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#363
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-04-22 19:35:12 +00:00
l3o af9bf88503 it - updated page with the indications for transaltion (#362)
Updated the page with the addition of the reference for the translations as in the English version

Co-authored-by: l3o <l3o@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#362
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-04-22 15:50:02 +00:00
antilopa b76593fe6d Merge pull request 'monthly overview update' (#360) from overview_march_2022 into master
Reviewed-on: Disroot/Website#360
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-04-20 15:01:31 +00:00
meaz af0ef01403 add translation team (#359)
Check this: Disroot/Disroot-Project#148 (comment)

If you agree with this, then we could add it in other languages too.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#359
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-04-13 11:16:13 +00:00
antilopa 0638f3af24 monthly overview update 2022-04-08 10:56:17 +02:00
meaz 5141fdfe32 Add a banner about translation on page (#280)
~~At the moment only the community added as a preview. If we agree with it + with Disroot/grav-theme-disroot#55 then it needs to be added on all other pages (modular.XX.md ones)~~

Done

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#280
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-03-29 15:14:21 +00:00
antilopa 5671c4d0d6 Merge pull request 'monthly overview update feb 2022' (#358) from overview_janFeb2022 into master
Reviewed-on: Disroot/Website#358
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-03-21 20:48:20 +00:00
antilopa ec5be80171 monthly overview update feb 2022 2022-03-21 14:07:05 +01:00
antilopa 9cc801f9b0 Merge pull request 'correction volunteer fees in 2021' (#357) from correction_overviewsum_2021 into master
Reviewed-on: Disroot/Website#357
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-03-21 13:00:35 +00:00
antilopa 97e342fa4f correction volunteer fees in 2021 2022-03-21 12:55:32 +01:00
antilopa 6d613f7e72 monthly overview dec 2021 (#346)
Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#346
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@no-reply@disroot.org>
Co-committed-by: antilopa <antilopa@no-reply@disroot.org>
2022-03-18 14:37:35 +00:00
Fede.- 9069fa50f4 Merge pull request 'Update Spanish translations of About and Goals pages' (#355) from website.SP.trans.update into master
Reviewed-on: Disroot/Website#355
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-03-11 02:58:25 +00:00
Fede.- f93a18a90e Merge branch 'master' into website.SP.trans.update 2022-03-11 02:57:45 +00:00
l3o dc9eee63da it updated core team page (#356)
Updated the page in Italian regarding this issue Disroot/Website#350 (comment)

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#356
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-03-10 20:32:02 +00:00
Fede.- bd45d300b4 Update Spanish translations of About and Goals pages 2022-03-09 02:16:33 +00:00
Fede.- 73039553ec Merge pull request 'Website Gitea service page dead link fixed (all languages)' (#354) from website.serv.gitea.fix into master
Reviewed-on: Disroot/Website#354
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-03-09 00:48:24 +00:00
Fede.- 820a9a4779 Merge branch 'master' into website.serv.gitea.fix 2022-03-09 00:39:18 +00:00
Fede.- f445ee0c1c Core team section update (#350)
Core team section update:
- about-who-and-why page text update
- core-team page AJ avatar added

Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#350
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Co-committed-by: Fede.- <fede@no-reply@disroot.org>
2022-03-08 21:11:27 +00:00
Fede.- 4baac5674b
Website Gitea service page dead link fixed (all languages) 2022-03-07 10:42:27 -03:00
meaz 5b86105708 Remove Framadate and ethercalc from website (#349)
To be merged on the 1st of March

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#349
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-03-01 21:37:39 +00:00
meaz 74f6261b0a add 5th volunteer goal and update to 2022 150€ possibility (#352)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#352
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-02-12 08:21:35 +00:00
Fede.- 1c37e7ddeb Merge pull request 'outage_post_fixes' (#345) from outage_post_fixes into master
Reviewed-on: Disroot/Website#345
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-02-01 13:41:54 +00:00
antilopa 1c6ab97a20 oof 2022-02-01 12:46:59 +01:00
antilopa e98417c4b5 revert 2022-02-01 12:46:16 +01:00
antilopa 62a493dcfe oops I have overwritten some fixes 2022-02-01 12:44:39 +01:00
antilopa 867ccb2814 correction 2022-02-01 12:43:54 +01:00
antilopa e8811005be corrected year and image dimensions 2022-02-01 12:41:52 +01:00
Fede.- 1fc0d083ed Merge pull request 'german translation of january outage blog post' (#344) from de_jan31blog_shadowsword into master
Reviewed-on: Disroot/Website#344
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-02-01 04:05:09 +00:00
Fede.- 650dd7fc97 Merge branch 'master' into de_jan31blog_shadowsword 2022-02-01 04:01:47 +00:00
shadowsword@disroot.org d23108ecc4 german translation of january outage blog post 2022-01-31 23:52:57 +01:00
Fede.- efa04d5f48 Merge pull request 'translation of the last post into Italian' (#342) from it_blog_outage_31jan into master
Reviewed-on: Disroot/Website#342
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-01-31 19:44:57 +00:00
l3o 540f20cf1c translation of the last post into Italian 2022-01-31 20:33:47 +01:00
antilopa 2190cb7788 Merge pull request 'update on major outage' (#341) from jan_outage into master
Reviewed-on: Disroot/Website#341
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-01-31 13:59:47 +00:00
Fede.- 5836596115 Fixed few typos and added Spanish translation 2022-01-31 10:55:02 -03:00
antilopa 167fc62143 update on major outage 2022-01-31 10:38:02 +01:00
shadowsword 116231a9cc [Website][Translation]{DE] Terms of Service (#337)
Final Version TOS German for now

Co-authored-by: shadowsword@disroot.org <shadowsword@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: Disroot/Website#337
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: shadowsword <shadowsword@no-reply@disroot.org>
Co-committed-by: shadowsword <shadowsword@no-reply@disroot.org>
2022-01-22 21:11:02 +00:00
Fede.- 34dee3318a Merge pull request 'Last part revision of the entire site in Italian' (#336) from it-last-part-revision into master
Reviewed-on: Disroot/Website#336
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-01-12 19:40:25 +00:00
l3o 7813eafa87 Last part revision of the site in Italian done 2022-01-12 19:58:50 +01:00
Rainer Bielefeld 62c11eeb41 the old link leads to the Jitsi Chat application. But for "Calls" the "Jitsi Meet" app is required. (#330)
I just tried 'https://calls.disroot.org//MeinDisrootTest' in WIN Jitsi
Meet, now works fine after Fix for issue #110

So now the linkfix is required.

Ok so or do you think direkt link to download area on the web page is not appropriate?

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#330
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2022-01-11 17:20:10 +00:00
Fede.- 1696851658 Merge pull request 'Updated xmpp bridges in italian' (#334) from xmpp-bridges-in-italian into master
Reviewed-on: Disroot/Website#334
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-01-10 22:22:17 +00:00
l3o 66327cc47b Updated xmpp bridges in italian 2022-01-10 21:08:44 +01:00
Fede.- ea810d4d78 Merge pull request 'Italian translation - content check and updating' (#332) from it-website-check into master
Reviewed-on: Disroot/Website#332
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2022-01-10 15:14:48 +00:00
l3o d0b2b0dbfe Verified all pages except the section servizi 2022-01-10 15:46:39 +01:00
meaz 7eb08e5f45 archive nextcloud news (#329)
Fix Disroot/Website#327

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#329
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-01-09 20:08:06 +00:00
avg_joe 54f90e16e6 Merge pull request 'Merge branch 'disroot-bold-on-home'' (#326) from disroot-bold-on-home into master
Reviewed-on: Disroot/Website#326
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-01-09 11:44:15 +00:00
meaz 5276900820 Merge branch 'master' into disroot-bold-on-home 2022-01-06 21:07:47 +00:00
Rainer Bielefeld ea31623988 Linkfix Related to 'Contact Page: Bad link to 'GPG: server.ubuntu.com' 🐛 #320 ' (#325)
Finished, can be merged.

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#325
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2022-01-06 21:06:46 +00:00
avg_joe 0bea6826a3 Merge branch 'de_shadowsword_emailunify' 2022-01-06 20:18:43 +01:00
avg_joe a956cce573 Merge pull request 'unified email spelling and typos' (#322) from de_shadowsword_emailunify into master
Reviewed-on: Disroot/Website#322
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2022-01-06 18:59:08 +00:00
avg_joe fd0cba4c8c fix typo 2022-01-06 19:46:03 +01:00
shadowsword@disroot.org 5e2c288ef7 unified email spelling and typos 2022-01-06 12:21:38 +01:00
avg_joe fff95878f9 perks: german translation, donation: adding hyphen (#313) 2022-01-05 21:38:45 +00:00
avg_joe 7b04999792 Merge branch 'master' into de_shadowsword_perks 2022-01-05 21:30:40 +00:00
shadowsword@disroot.org 905494249b latest changes, all "E-Mail" with non-brk hyphen 2022-01-05 20:02:16 +01:00
shadowsword@disroot.org 80a66e28d6 reviewed review 2022-01-05 19:24:21 +01:00
meaz 924c2d0b74 xmpp bridges in French (#314)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#314
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-01-04 15:27:24 +00:00
avg_joe e18ae840d2 review 2022-01-03 23:14:04 +01:00
shadowsword@disroot.org 22d21d09d5 perks: german translation
donation: adding hyphen
2022-01-03 21:24:14 +01:00
avg_joe 20d0245945 Merge pull request 'I fixed some Typos in SERVICES > XMPP > DE!' (#309) from 220102_Services_XMPP_DE_TypoFixes into master
Reviewed-on: Disroot/Website#309
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-01-03 13:50:54 +00:00
avg_joe bb66558025 Merge branch '220102_Services_XMPP_DE_TypoFixes' of https://git.disroot.org/Disroot/Website into 220102_Services_XMPP_DE_TypoFixes 2022-01-03 14:41:27 +01:00
avg_joe 5aa75bd709 review incl small changes 2022-01-03 14:13:58 +01:00
Rainer Bielefeld 5cc2c25f08 Complete ly new translation of this area.
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
2022-01-03 14:13:58 +01:00
Rainer Bielefeld e41923b0a1 I fixed some Typos in SERVICES > XMPP > DE!
Remaining Questions (general, not translation related):
a) „bau-haus.net“ still up to date?

b) bot.disroot.org: What's that? Explication is rather rare. „get in 
touch with us“? Which way?
2022-01-03 14:13:58 +01:00
Fede.- b5b17fef42 Merge pull request 'Modified MX record address EN/ES/FR/IT' (#312) from FIX_Custom.domain.MX into master
Reviewed-on: Disroot/Website#312
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-01-03 10:45:40 +00:00
Fede.- d6ef5d268c Modified MX record address EN/ES/FR/IT 2022-01-03 01:01:50 -03:00
Fede.- f5195ac720 Merge pull request 'minor fixes & cryptpad translation' (#306) from de_shadowsword_minor01 into master
Reviewed-on: Disroot/Website#306
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-01-03 02:13:22 +00:00
Fede.- 4abac36346 Merge branch 'master' into de_shadowsword_minor01 2022-01-03 02:10:32 +00:00
Fede.- a50c790f5e Remove conflict file 2022-01-02 23:09:53 -03:00
shadowsword@disroot.org a613e5993f updated after review 2022-01-02 23:24:12 +01:00
l3o e56254ee18 it-news03-2021 (#307)
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 22:35:59 +01:00
avg_joe e2496c22a6 review incl small changes 2022-01-02 21:40:45 +01:00
avg_joe 6a8721d111 review (typos + suggestions) 2022-01-02 21:00:17 +01:00
Rainer Bielefeld 17929e7f2f Complete ly new translation of this area.
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
2022-01-02 19:49:16 +01:00
Rainer Bielefeld f21effdc34 I fixed some Typos in SERVICES > XMPP > DE!
Remaining Questions (general, not translation related):
a) „bau-haus.net“ still up to date?

b) bot.disroot.org: What's that? Explication is rather rare. „get in 
touch with us“? Which way?
2022-01-02 12:55:06 +01:00
l3o a79e479325 it-news03-2021 (#307)
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 07:34:45 +00:00
shadowsword@disroot.org 220488b87d minor fixes & cryptpad translation 2022-01-01 22:40:56 +01:00
avg_joe daefec2d20 Merge pull request '20211231_Blog4Mewyear_DE' (#302) from 20211231_Blog4Mewyear_DE into master
Reviewed-on: Disroot/Website#302
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-31 20:55:39 +00:00
avg_joe 4ab26c3c7e Merge branch 'master' into 20211231_Blog4Mewyear_DE 2021-12-31 20:54:38 +00:00
meaz 1e2ad2caf0 Merge pull request 'typo in blog post' (#301) from blogpost_typo into master
Reviewed-on: Disroot/Website#301
2021-12-31 15:50:39 +00:00
meaz 5cf029aed9
typo in blog post 2021-12-31 16:50:12 +01:00
avg_joe 47f7b3f5d6 fix faq quotation marks (#299)
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#299
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-31 15:48:03 +00:00
Rainer Bielefeld 1508ec9d02 4 Typos corrected 2021-12-31 15:57:57 +01:00
avg_joe 800f4feb53 Merge pull request 'fix-german-translation-for-donation' (#297) from fix-german-translation-for-donation into master
Reviewed-on: Disroot/Website#297
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-31 10:37:07 +00:00
Rainer Bielefeld 120421a3ad German Translation for Hyppy New Year Blog Post. Related to Disroot/Website#294 2021-12-31 11:08:54 +01:00
avg_joe 86533aff10 Merge branch 'master' into fix-german-translation-for-donation 2021-12-31 10:05:12 +00:00
l3o 7526b0c38c translated into italian perks page (#298)
I translated perks page into Italian
I corrected a small typo (a space) in the Italian text of newsletter # 4

Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#298
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2021-12-31 07:54:20 +00:00
Fede.- 46fc1b63b7 Merge pull request 'DisNews#4 Fixes' (#293) from disnews_4_FIX into master
Reviewed-on: Disroot/Website#293
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-12-30 19:25:21 +00:00
meaz 84ea839d23
Merge branch 'master' into disnews_4_FIX 2021-12-30 20:16:39 +01:00
avg_joe 47f42d96e5 Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 16:09:04 +01:00
avg_joe 61c30a673d avg_joe 2021-12-30 16:08:38 +01:00
avg_joe ee5c0a783f avg_joe 2021-12-30 16:05:42 +01:00
meaz 407f5e1864 Update vagrant again! (#285)
I added the default Disroot's yaml config files, added some info + delete the default vagrant files/folder we get with new installation.

I destroyed vagrant and reinstalled several times, it worked  perfectly each time.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#285
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 11:32:55 -03:00
meaz 9dac4063de Fix lot of errors with forms (#295)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 11:32:55 -03:00
avg_joe 067d94f2c4 Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 14:37:20 +01:00
avg_joe 9a6a8674d6 missed it 2021-12-30 14:35:32 +01:00
avg_joe 51598aaed0 fix about change de 2021-12-30 14:35:32 +01:00
avg_joe 19c3f476c8 inital commit trans don ger 2021-12-30 14:35:32 +01:00
avg_joe 99d913b3f2 missed it 2021-12-30 14:34:12 +01:00
avg_joe b5d760623b fix about change de 2021-12-30 14:32:50 +01:00
avg_joe dba372135b Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 14:29:02 +01:00
avg_joe 2edb6b34a3 inital commit trans don ger 2021-12-30 14:18:44 +01:00
avg_joe dd95954c2a Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 13:55:29 +01:00
avg_joe 06738682fc inital commit trans don ger 2021-12-30 13:44:12 +01:00
avg_joe 15f6fb9d52 inital commit trans don ger 2021-12-30 13:39:12 +01:00
meaz 31dd9e1a7a Update vagrant again! (#285)
I added the default Disroot's yaml config files, added some info + delete the default vagrant files/folder we get with new installation.

I destroyed vagrant and reinstalled several times, it worked  perfectly each time.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#285
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 10:43:53 +00:00
meaz e3b5ae237b Fix lot of errors with forms (#295)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 10:43:09 +00:00
meaz f887459daa Merge branch 'master' into disnews_4_FIX 2021-12-30 10:02:45 +00:00
meaz df8736e06e Fix link + texts on other languages on about page, privacy section (#281)
Fix Disroot/Website#278 and Disroot/Website#279

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#281
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 10:02:09 +00:00
meaz 1e9f8ac118 Merge branch 'master' into disnews_4_FIX 2021-12-30 09:36:59 +00:00
avg_joe e2c23dff5e finish mumble + about section (#288)
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#288
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-30 09:36:24 +00:00
meaz 20b69782f6 Merge pull request 'Frenh traduction of disnew 4' (#296) from Disnews4_fr into master
Reviewed-on: Disroot/Website#296
2021-12-30 09:35:27 +00:00
meaz 1cb3f07c2f
Frenh traduction of disnew 4 2021-12-30 10:34:35 +01:00
Fede.- ed76abdc76 DisNews#4 Fixes 2021-12-29 22:41:12 -03:00
antilopa c9960b84ae Merge pull request 'fix_news4' (#291) from fix_news4 into master
Reviewed-on: Disroot/Website#291
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-12-29 21:20:25 +00:00
antilopa 41975179a9 added image without white frame 2021-12-29 22:16:44 +01:00
antilopa b4a4ec8d15 typo in header 2021-12-29 22:11:47 +01:00
antilopa cc9426fb78 typo in header 2021-12-29 22:05:45 +01:00
l3o 68c67e3ba5 it-disneews4 (#290)
I translated the newsletter #4 into Italian ;)

Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#290
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2021-12-29 20:26:49 +00:00
meaz 7fd16ef6c7 fix error with mumble links (#287)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#287
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-29 19:59:02 +00:00
antilopa 8410835793 Merge pull request 'disnews_4' (#282) from disnews_4 into master
Reviewed-on: Disroot/Website#282
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-29 09:42:09 +00:00
antilopa ffb50af77b uodated publish date 2021-12-29 10:30:22 +01:00
antilopa f1e21d8b0c removed media order header 2021-12-29 10:25:33 +01:00
antilopa e974d6e043 remove capitalization from link 2021-12-29 10:10:13 +01:00
antilopa 8e81329bcd added some accents 2021-12-29 10:03:21 +01:00
antilopa ca5fc5fbdd fixed image size 2021-12-29 09:45:42 +01:00
meaz 34c653af65
remove extra ; 2021-12-29 08:34:32 +01:00
meaz d0d3b3d0b8
remove defaults grav pages! 2021-12-29 08:29:02 +01:00
Fede.- e71589e89d Fixed few typos on English post + Spanish translation 2021-12-29 04:10:07 -03:00
antilopa 1707964b06 added more rojects 2021-12-29 01:36:52 +01:00
antilopa 59b6c720c8 floss projects list 2021-12-29 01:17:11 +01:00
antilopa 6610ba9f29 minor change 2021-12-29 00:34:30 +01:00
antilopa ceb46679d8 disnews #$ 2021-12-29 00:04:25 +01:00
Rainer Bielefeld bb5a84b82d German2021-12-21 (#274)
This branch is ready to bemerged with master.

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#274
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2021-12-28 10:51:35 +00:00
meaz a1a791398e No Auto Discovery for RSS Feed #266 (#275)
Fix Disroot/Website#266

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#275
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-27 06:27:37 +00:00
antilopa 66bd2f2e15 Merge pull request 'moved menu item 'perks' to different positiong in top bar' (#273) from change_menu_order into master
Reviewed-on: Disroot/Website#273
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-22 19:25:48 +00:00
meaz f80aea0c11 Update vagrant to php8 and grav to 1.7.24 (#268)
In order to better match with what is on prod.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#268
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-22 06:29:56 +00:00
meaz e6362f77f5 remove hubzilla contact (#269)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#269
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-22 06:28:51 +00:00
antilopa e90f1588f4 moved menu item 'perks' to different positiong in top bar 2021-12-19 20:38:33 +01:00
Fede.- d4c0f5c207 Merge pull request 'Second Second attempt to contribute Translation' (#272) from RainersNewHomepageTranslation_de into master
Reviewed-on: Disroot/Website#272
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-12-15 18:21:24 +00:00
Rainer Bielefeld e3d292373b Second Second attempt to contribute Translation 2021-12-15 16:46:10 +01:00
antilopa b741693b94 Merge pull request 'overview update' (#267) from overview_oct_nov_2021 into master
Reviewed-on: Disroot/Website#267
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-12-10 22:24:49 +00:00
antilopa 666ce9e508 overview update 2021-12-09 16:02:32 +01:00
Fede.- f2b4a3f0fa Merge pull request 'DisNews #3' (#265) from news03-2021 into master
Reviewed-on: Disroot/Website#265
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-11-21 01:05:12 +00:00
Fede.- eea01abe24 Small fix on "clickbait" line. 2021-11-20 19:40:55 -03:00
Fede.- a32a9c32da Small modifications on text (as requested) (English and Spanish version) 2021-11-20 19:34:47 -03:00
Fede.- 463e88698a Sp translation of blogpost: Small typo fixed 2021-11-20 17:12:40 -03:00
Fede.- d63a854e2f Poll link added + Spanish translation 2021-11-20 17:09:19 -03:00
Fede.- c8d61c7b86 Blogpost #3 2021-11-20 02:32:38 -03:00
famubu 22201e9f4e Fix tiny typo (#264)
Reviewed-on: Disroot/Website#264
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: famubu <famubu@no-reply@disroot.org>
Co-committed-by: famubu <famubu@no-reply@disroot.org>
2021-11-16 09:58:23 +00:00
meaz f67e334b05 remove mentions of alias on home page (#263)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#263
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-15 16:17:42 +00:00
antilopa d56d0e972c Merge pull request 'frequency_fix_french' (#262) from frequency_fix_french into master
Reviewed-on: Disroot/Website#262
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-15 15:01:24 +00:00
antilopa 33a8e23db3 more fixes 2021-11-09 22:55:20 +01:00
antilopa eb50368cb2 small fixes to french translation 2021-11-09 22:53:28 +01:00
antilopa 73b156cc19 Merge pull request 'removed contribution frequency from form' (#261) from domain_form_fix into master
Reviewed-on: Disroot/Website#261
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-09 20:48:41 +00:00
antilopa e2ea310fe9 removed contribution frequency from form 2021-11-07 21:32:06 +01:00
Fede.- 40267a87eb Merge pull request 'Perks: Spanish translation' (#259) from perks_sp into master
Reviewed-on: Disroot/Website#259
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-05 01:16:23 +00:00
Fede.- 7722a137f9 Merge branch 'perks_sp' of https://git.disroot.org/Disroot/Website into perks_sp 2021-11-04 22:15:41 -03:00
Fede.- 591bc1f7c3 Perks: Spanish translation 2021-11-04 22:15:04 -03:00
meaz 027c662d6e Merge pull request 'Fix typo on French translation' (#260) from meaz-patch-1 into master
Reviewed-on: Disroot/Website#260
2021-11-04 09:03:06 +00:00
meaz f0f16eb0a0 Fix typo on French translation 2021-11-04 09:02:46 +00:00
meaz 1ffe242805 Merge branch 'master' into perks_sp 2021-11-04 08:47:57 +00:00
meaz bab54463af French translation of Perks page (#258)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#258
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-04 08:47:26 +00:00
Fede.- 55df644a11 Perks: Spanish translation 2021-11-03 13:09:26 -03:00
muppeth e558dedeba Merge pull request 'custom domain - form and service-email page changes' (#253) from customdomainchanges into master 2021-11-02 15:20:48 +00:00
antilopa b65f0af795 small edits 2021-11-02 15:50:03 +01:00
muppeth 6b760a52ea Merge branch 'master' into customdomainchanges 2021-11-02 09:59:40 +00:00
meaz 74acccd923 Perks (#247)
Here is the new "perks" branch, where we can list how to get more storage + custom domain.

Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: Disroot/Website#247
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-02 09:59:13 +00:00
antilopa ec48b98601 Merge pull request 'overview_sep_2021' (#257) from overview_sep_2021 into master
Reviewed-on: Disroot/Website#257
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-10-31 12:28:35 +00:00
meaz f8391417cc Update Contact page in other languages (#256)
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: Disroot/Website#256
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-10-29 05:36:18 +00:00
antilopa 0f824428c7 improve image 2021-10-28 16:55:01 +02:00
antilopa 876e482434 correct image 2021-10-28 16:52:33 +02:00
antilopa 4dc3556eb8 monthly overview September 2021 2021-10-28 16:48:52 +02:00
Fede.- c411a7a1f7 Merge pull request 'WEBSITE_SP_UPDATE' (#255) from WEBSITE_SP_UPDATE into master
Reviewed-on: Disroot/Website#255
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-10-06 18:25:35 +00:00
meaz 5d799da4d2 Contact page links color (#254)
change links color as it was not readable with the blueish color behind.

If you agree with this, then I'll implement it in other languages pages.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#254
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-10-05 14:41:08 +00:00
Fede.- 3659cac6ca Website's spanish translation update 2021-10-05 01:01:38 -03:00
Fede.- 87622a15cd Website's spanish translation update 2021-10-05 00:30:54 -03:00
meaz 4f80ea3b48
typo 2021-10-01 14:13:01 +02:00
meaz b1f4baacde
add missing quotes 2021-10-01 14:12:14 +02:00
meaz 412062ee1c
French translation 2021-10-01 14:11:04 +02:00
muppeth 0572659f9b
custom domain - form and service-email page changes 2021-10-01 11:37:25 +02:00
meaz 15d2ab205a update cryptpad with new icons + form (#252)
Fix [Disroot/Website#251](Disroot/Website#251)

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/Website#252
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-09-23 19:59:20 +00:00
antilopa 2b8d27ba47 Merge pull request 'Monthly overview july, august 2021' (#250) from overview_jul_aug_2021 into master
Reviewed-on: Disroot/Website#250
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-09-08 18:10:33 +00:00
antilopa 5b7239514e some errors in spreadsheet corrected 2021-09-06 11:03:47 +02:00
antilopa 6383bc79fc updated patreon's total donations 2021-09-06 10:25:42 +02:00
antilopa 3f827420ca Monthly overview july, august 2021 2021-09-03 12:51:41 +02:00
meaz 7ad7ff0225 Merge pull request 'add nocache to img link' (#249) from greenweb into master
Reviewed-on: Disroot/Website#249
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-08-18 07:03:10 +00:00
meaz 2998cc2414
add nocache to img link 2021-08-10 09:22:05 +02:00
antilopa 912d1b1779 Merge pull request 'overview_june_2021' (#246) from overview_june_2021 into master
Reviewed-on: Disroot/Website#246
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-07-29 10:07:58 +00:00
antilopa 7cb801adfc Merge branch 'overview_june_2021' of git.disroot.org:Disroot/Website into overview_june_2021
update branch
2021-07-29 09:09:49 +02:00
antilopa 30abe07f10 unlock goal 3 volunteers 2021-07-29 09:08:03 +02:00
meaz a903cb436d Merge branch 'master' into overview_june_2021 2021-07-28 09:44:57 +00:00
meaz f9b25c7000 Merge pull request 'remove covid kit' (#245) from kill_covid into master
Reviewed-on: Disroot/Website#245
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-07-28 08:10:17 +00:00
antilopa aafc302cd6 better graph capture 2021-07-27 22:18:42 +02:00
antilopa 12cd00ca7d donation overview june 2021 2021-07-27 22:16:32 +02:00
meaz c939ce8825
remove covid kit 2021-07-27 22:13:24 +02:00
meaz 6114824888 Merge pull request 'Add a script to deploy Website easily on Debian.' (#244) from debian_script into master
Reviewed-on: Disroot/Website#244
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-07-17 19:18:22 +00:00
meaz 427a1c5800
Merge branch 'master' of https://git.disroot.org/Disroot/Website into debian_script 2021-07-17 21:17:15 +02:00
meaz e7ef74d4a8 Merge pull request 'vagrant_fix' (#243) from vagrant_fix into master
Reviewed-on: Disroot/Website#243
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-07-17 19:13:48 +00:00
meaz b329cb08ed
Add a script to deploy Website easily on Debian. 2021-07-16 11:08:04 +02:00
meaz 29d3dc0046
fix more errors + update on vagrant and virtualbox 2021-07-16 10:27:31 +02:00
meaz 494235686c
Fix some errors with vagrant 2021-07-16 10:13:55 +02:00
meaz 1b958c5da6 Merge pull request 'remove matrix in FAQ' (#242) from faq_matrix into master
Reviewed-on: Disroot/Website#242
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-07-13 21:11:19 +00:00
meaz 4f79c42d04
remove matrix in FAQ 2021-07-13 22:15:51 +02:00
antilopa 34ace715a3 Merge pull request 'The way the bank account details were set was causing confusion, adding a ':' to make it clearer' (#240) from fix_bank_details into master
Reviewed-on: Disroot/Website#240
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-21 07:40:08 +00:00
antilopa f0ea35ffc3 The way the bank account details were set was causing confusion, adding a ':' to make it clearer 2021-06-18 11:17:16 +02:00
antilopa 28ad8e2593 Merge pull request 'overview update april ,may' (#239) from overview_may_2021 into master
Reviewed-on: Disroot/Website#239
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-16 08:38:13 +00:00
meaz 5607daa442 Merge branch 'master' into overview_may_2021 2021-06-15 04:32:43 +00:00
antilopa 4b8a972f16 overview update april ,may 2021-06-13 13:46:50 +02:00
numnum 4158420d2c Cryptpad storage space should be 250MB (#238)
Co-authored-by: ltGuillaume <ltguillaume@users.noreply.github.com>
Reviewed-on: Disroot/Website#238
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: numnum <numnum@no-reply@disroot.org>
Co-committed-by: numnum <numnum@no-reply@disroot.org>
2021-06-10 17:40:25 +00:00
muppeth e9688aeb14 changed IRC channel info to liberachat on contact page (#236)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#236
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-04 11:20:38 +00:00
Fede.- ae6e0b4323 Merge pull request 'BLOG_Disnews_ES' (#235) from BLOG_Disnews_ES into master
Reviewed-on: Disroot/Website#235
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-02 16:27:46 +00:00
Fede.- 8dc9ffbd0a DisNews-2 Spanish translation / Small fixes 2021-06-02 00:15:17 -03:00
Fede.- ceee7da9fa DisNews-2 Spanish Translation 2021-06-01 23:48:35 -03:00
meaz 2ea5dd1a0a Merge pull request 'it-disnews-2' (#234) from it-disnews-2 into master
Reviewed-on: Disroot/Website#234
2021-06-01 12:19:55 +00:00
l3o 9153c1ec69 Corrected small translation error in Italian 2021-05-31 22:04:49 +02:00
l3o 7938db5b0d Translated into italian post disnews 2 2021-05-31 22:01:30 +02:00
muppeth 8b2fefa94f disnews #2 (#233)
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: Disroot/Website#233
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
2021-05-31 06:57:32 +00:00
Fede.- c2f5e56e0b Merge pull request 'add the new yearly report and foos donations in 2020' (#232) from yearly_rapport_2020 into master
Reviewed-on: Disroot/Website#232
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-05-27 19:48:37 +00:00
antilopa 512bb3dc80 add the new yearly report and foos donations in 2020 2021-05-27 20:17:46 +02:00
meaz 7869b17f7c Merge pull request 'add info about changelog repo in readme file' (#227) from changelog_readme into master
Reviewed-on: Disroot/Website#227
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-04-18 05:43:06 +00:00
meaz a95aa8befd Merge branch 'master' into changelog_readme 2021-04-17 07:23:17 +00:00
Fede.- a001d259a3 Merge pull request 'Blogpost about FLISoL 2021' (#226) from flisol_2021 into master
Reviewed-on: Disroot/Website#226
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-04-17 07:00:12 +00:00
meaz 43fc0bdb9e
add info about changelog repo in readme file 2021-04-17 07:32:53 +02:00
Fede.- 577dac562d Blogpost about FLISoL 2021 2021-04-16 23:13:26 -03:00
meaz eff3677a11 Merge pull request 'fix a bit links to forms so that it works better in vagrant' (#224) from forms_language into master
Reviewed-on: Disroot/Website#224
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-13 18:35:30 +00:00
meaz a5544c0443 Merge branch 'master' into forms_language 2021-04-13 18:35:05 +00:00
meaz ce95533a35 Merge pull request 'add stripe in forms' (#223) from stripe into master
Reviewed-on: Disroot/Website#223
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-13 18:34:39 +00:00
meaz a5eb8de102
set grav version back to 1.6.18 2021-04-13 10:23:57 +02:00
meaz de114b0d1b
fix a bit links to forms so that it works better in vagrant 2021-04-13 10:22:35 +02:00
meaz 8b28928854 Merge branch 'master' into stripe 2021-04-13 08:20:50 +00:00
meaz 6c285178ff
add stripe in forms 2021-04-13 10:17:39 +02:00
antilopa 26b3c4ea42 Merge pull request 'updated monthly overview' (#222) from overview_march_2021 into master
Reviewed-on: Disroot/Website#222
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-04-12 10:26:01 +00:00
antilopa 8d072460e3 updated monthly overview 2021-04-11 21:27:04 +02:00
meaz 16f21a0faf Merge pull request 'fix display issue with title on about page in mobile view' (#221) from about_mobile into master
Reviewed-on: Disroot/Website#221
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-11 15:01:22 +00:00
antilopa 70a145172f fixed line breaks on all languages 2021-04-11 13:22:13 +02:00
antilopa b3982468fc fixed some line breaks 2021-04-11 13:16:53 +02:00
meaz ea24ff9a69 Merge branch 'master' into about_mobile 2021-04-11 07:51:24 +00:00
meaz e0319f9dd6
fix display issue with title on about page in mobile view 2021-04-11 09:39:51 +02:00
meaz 187cb44466 Merge pull request 'Fix link on home page FR' (#216) from meaz-patch-1 into master
Reviewed-on: Disroot/Website#216
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-09 06:24:39 +00:00
meaz 55dab37937 Merge branch 'master' into meaz-patch-1 2021-04-09 06:24:24 +00:00
Fede.- 4ba1e576a2 Merge pull request 'Fixed dead link to Account Administration' (#215) from FIX_ABOUT_LINK into master
Reviewed-on: Disroot/Website#215
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-09 06:03:58 +00:00
Fede.- 8aa7d3a5d1 Merge branch 'FIX_ABOUT_LINK' of https://git.disroot.org/Disroot/Website into FIX_ABOUT_LINK 2021-04-09 03:03:14 -03:00
Fede.- c969df7025 Removed howto link + Text update 2021-04-09 03:02:56 -03:00
Fede.- 86563bff2b Fixed dead link to Account Administration 2021-04-09 03:02:56 -03:00
avg_joe 44e5a6fab1 Merge pull request 'fix-dead/broken-links-on-website' (#218) from fix-dead/broken-links-on-website into master
Reviewed-on: Disroot/Website#218
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-08 20:16:13 +00:00
Fede.- ab83a9d4fa Removed howto link + Text update 2021-04-08 17:16:11 -03:00
avg_joe 52d10c9072 git: add https for valid link 2021-04-08 18:11:36 +02:00
avg_joe e67095748f valid mumble link 2021-04-08 18:08:35 +02:00
avg_joe 5fc8d5c4a8 DE taiga scrum wiki 2021-04-08 18:03:40 +02:00
avg_joe 840be13020 tos: replace disource announcement with blog 2021-04-08 17:59:48 +02:00
avg_joe bf0d782863 xmpp: search.jabber.network 2021-04-08 17:34:18 +02:00
avg_joe e21f23c0cb clients: mumble-web 2021-04-08 17:29:18 +02:00
avg_joe ef4e972c49 faq pw change 2021-04-08 17:25:43 +02:00
meaz 8c12b5158e Fix link on home page FR 2021-04-08 09:16:10 +00:00
Fede.- 85168ecc13 Fixed dead link to Account Administration 2021-04-07 18:06:17 -03:00
avg_joe a5353221bd update 2019 annual report for DE (#214)
Co-Authored-By: avg_joe <avg_joe@no-reply@disroot.org>
Co-Committed-By: avg_joe <avg_joe@no-reply@disroot.org>
2021-04-07 19:11:24 +00:00
meaz e90b0e264c Merge pull request 'it-blog-rss' (#213) from it-blog-rss into master
Reviewed-on: Disroot/Website#213
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-04-07 09:47:46 +00:00
l3o da3d9a320b Fixet small mistakes 2021-04-07 10:32:06 +02:00
l3o 1558071b67 It translation blog post killing ncnews 2021-04-07 10:25:20 +02:00
Fede.- c762edb48f Merge pull request 'Killing_NCNews_SP' (#212) from Killing_NCNews_SP into master
Reviewed-on: Disroot/Website#212
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-04-07 02:44:03 +00:00
Fede.- 333e2e18bf Fixed few typos. 2021-04-06 18:05:12 -03:00
Fede.- 67c605f6a9 Spanish translation of NC News post 2021-04-06 17:57:47 -03:00
Fede.- 0c86baa10e Merge pull request 'added blog post about killing ncnews' (#211) from killing_ncnews into master
Reviewed-on: Disroot/Website#211
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-04-06 20:20:18 +00:00
Fede.- fe5d35de72 Merge branch 'killing_ncnews' of https://git.disroot.org/Disroot/Website into killing_ncnews 2021-04-06 17:16:43 -03:00
Fede.- 7de5ba5990 Fixed few typos, added/removed spaces between paragraphs & changed a couple of words. 2021-04-06 17:16:26 -03:00
meaz 21d73cbff5 better emphasize on complete shutdown phrase 2021-04-06 17:16:26 -03:00
antilopa 4027a5dc5f proof reading #1 2021-04-06 17:16:26 -03:00
muppeth 58906a71bb added blog post about killing ncnews 2021-04-06 17:16:26 -03:00
Fede.- a8b380638b Merge branch 'master' into killing_ncnews 2021-04-06 20:14:10 +00:00
meaz 491f7d9684 Merge pull request 'Add changelog to website' (#207) from changelog into master
Reviewed-on: Disroot/Website#207
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-04-06 20:11:34 +00:00
meaz 61f1c778fe Merge branch 'master' into changelog 2021-04-06 18:32:15 +00:00
Fede.- 459647fd96 Fixed few typos, added/removed spaces between paragraphs & changed a couple of words. 2021-04-05 23:51:58 -03:00
meaz ab6f7566b4
better emphasize on complete shutdown phrase 2021-04-05 20:25:49 +02:00
antilopa e8b55fb4ce proof reading #1 2021-04-05 16:57:08 +02:00
muppeth 2aa5a6289b
added blog post about killing ncnews 2021-04-05 16:31:21 +02:00
muppeth 3318812003 removed the rss news post 2021-04-05 16:29:23 +02:00
muppeth 127b799286 killing nc news post 2021-04-05 16:25:05 +02:00
muppeth dea3ec202c
Added git.ignore since we need that as fullbar comes from other repo 2021-04-02 12:02:43 +02:00
meaz 11150e3aff Merge branch 'master' into changelog 2021-04-02 07:11:18 +00:00
antilopa 07839ffbe7 Fixed order of tasks so changelog is created before it is renamed 2021-04-01 22:05:48 +02:00
Fede.- eb61ca8f41 Merge pull request 'BLOG_SP_01-2021-03' (#209) from BLOG_SP_01-2021-03 into master
Reviewed-on: Disroot/Website#209
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-03-29 18:23:21 +00:00
meaz 142377cb8b
change mv to cp 2021-03-29 08:55:32 +02:00
meaz e259ae21ad
fix changelog name 2021-03-29 08:49:50 +02:00
meaz 2e28825d29
fix path for changelog file name change 2021-03-29 08:39:43 +02:00
meaz 6837d29332
change changelog file name 2021-03-29 08:33:56 +02:00
meaz c90d3082ba Merge branch 'master' into changelog 2021-03-29 06:07:22 +00:00
meaz ccf2ad726e
change path to match theme repo + change file name to match template 2021-03-29 08:01:20 +02:00
Fede.- d02a0d7a2d Merge branch 'master' into BLOG_SP_01-2021-03 2021-03-28 20:12:34 +00:00
Fede.- 01fadb7320 Merge pull request 'news01-blog-it' (#210) from news01-blog-it into master
Reviewed-on: Disroot/Website#210
2021-03-28 20:11:36 +00:00
l3o a16092b1a5 Corrected minor translation errors 2021-03-28 21:11:07 +02:00
l3o ff1c5653aa Translated article news 01 in italian 2021-03-28 20:58:04 +02:00
Fede.- 02be9051a7 Small fixes on SP translation 2021-03-27 16:48:17 -03:00
Fede.- 656d649a76 Last post translation into Sp + Fixed dead link in NC service section 2021-03-27 16:39:19 -03:00
muppeth 5e22f63cc2 quick fix 2021-03-27 14:53:01 +01:00
Fede.- 39b970ff04 Merge pull request 'DisNews #1 - March 2021' (#208) from 2021-#3 into master
Reviewed-on: Disroot/Website#208
2021-03-27 13:24:43 +00:00
muppeth cc1bc39b0d DisNews #1 - March 2021 2021-03-27 13:54:26 +01:00
meaz cb017dc04c
remove coronavirus image 2021-03-22 13:19:56 +01:00
antilopa e29311042d While at it, corrected annoying white strip on the bottom of EN home page 2021-03-22 12:30:01 +01:00
antilopa b6cd258e8e Moved Change Log item menu to footer, added new picture 2021-03-22 12:27:09 +01:00
meaz e9c96371c5
add changelog to website 2021-03-20 11:48:20 +01:00
meaz c1fe514ebb
add changelog symbolic link in gitignore 2021-03-20 11:47:50 +01:00
meaz 5b9124c0f3
fix problem with gpm + PP and add changelog 2021-03-20 11:46:26 +01:00
meaz a0566b9e01
add changelog repo 2021-03-20 11:23:34 +01:00
meaz ebc24b78a8 Merge pull request 'Add if to avoid errors + fix few other errors + fix erros with PP' (#194) from vagrant_if into master
Reviewed-on: Disroot/Website#194
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-03-09 13:38:47 +00:00
meaz f6ef0dd5e2 Merge branch 'master' into vagrant_if 2021-03-03 10:51:15 +00:00
meaz 19bda7ef1e Merge pull request 'Correct typo in english form' (#205) from wallun/disroot-website:master into master
Reviewed-on: Disroot/Website#205
2021-03-03 10:50:58 +00:00
Wallun 57559db9ad
Correct typo in english form 2021-03-03 10:22:26 +01:00
meaz 6dd7b8b18f update overview feb 2021 (#204) 2021-03-02 13:05:04 +00:00
antilopa 865dfb4896 update overview feb 2021 2021-03-02 13:37:52 +01:00
meaz 1605fb86cd Merge pull request 'yearly overview 2020' (#203) from overview2020 into master
Reviewed-on: Disroot/Website#203
2021-03-02 10:09:31 +00:00
meaz 22b6c2479b Merge branch 'master' into overview2020 2021-03-02 10:09:12 +00:00
antilopa 14692da53c Merge pull request 'Update coffee index page link' (#202) from coffee into master
Reviewed-on: Disroot/Website#202
2021-03-02 09:52:18 +00:00
antilopa 34dd1d576a yearly overview 2020 2021-03-02 10:22:34 +01:00
meaz e79c8dbde4 Update coffee index page link 2021-03-01 09:43:20 +01:00
meaz b0591bc818 Merge pull request 'Changed bank info and made other small fixes in ita translation' (#201) from it-bank-transfer into master
Reviewed-on: Disroot/Website#201
2021-02-26 20:42:03 +00:00
l3o b0fcafc73b Fixed mistake in form 2021-02-26 21:39:09 +01:00
l3o 8742ba27f4 Changed bank info and made other small fixes in ita translation 2021-02-26 20:46:11 +01:00
antilopa d557542946 Merge pull request 'bank transfer restricited to SEPA only' (#200) from sepa into master
Reviewed-on: Disroot/Website#200
2021-02-25 08:10:08 +00:00
meaz 911e0a4bc6 bank transfer restricited to SEPA only 2021-02-25 09:04:27 +01:00
Fede.- da48afef5f Merge pull request 'remove link as it is not directing to the right website anymore' (#198) from exploitation into master
Reviewed-on: Disroot/Website#198
2021-02-23 22:51:24 +00:00
Fede.- 1b4710079b Merge branch 'exploitation' of https://git.disroot.org/Disroot/Website into exploitation 2021-02-23 19:50:33 -03:00
meaz c862174dbb remove link as it is not directing to the right website anymore 2021-02-23 19:50:20 -03:00
meaz be2cc4e8d5 remove link as it is not directing to the right website anymore 2021-02-23 11:52:04 +01:00
meaz 9006269c42 Merge pull request 'Spanish translation of last post' (#197) from Blog_Sp_translation into master
Reviewed-on: Disroot/Website#197
2021-02-22 19:28:20 +00:00
Fede.- d716753d53 Spanish translation of last post 2021-02-22 11:13:41 -03:00
antilopa f6be008952 Merge pull request 'blog post about the downtime because of the loose cable' (#196) from cable_downtime into master
Reviewed-on: Disroot/Website#196
2021-02-22 13:31:20 +00:00
antilopa 9a3d59f2f1 added a line break for readabilty 2021-02-22 14:30:47 +01:00
antilopa 65882ccf66 corrected post date from 2020 to 2021 2021-02-22 14:30:07 +01:00
antilopa 7c93cc2be5 corrected some typos 2021-02-22 14:19:44 +01:00
muppeth b8d9e419b3 blog post about the downtime because of the loose cable 2021-02-22 13:22:00 +01:00
meaz 592380c04f Fix typo in russian version 2021-02-20 09:55:49 +01:00
meaz 6e29c5d74c Merge pull request 're-enable extra storage forms' (#195) from enable_storage_form into master
Reviewed-on: Disroot/Website#195
2021-02-18 05:38:17 +00:00
antilopa 881d33ed25 re-enable extra storage forms 2021-02-18 00:15:09 +01:00
meaz e1cd829666 Add if to avoid errors + fix few other errors + fix erros with PP 2021-02-14 11:30:15 +01:00
antilopa affd69dea1 Merge pull request 'Update contact with new gpg key for cryptdisroot' (#192) from contact_gpg into master
Reviewed-on: Disroot/Website#192
2021-02-13 07:34:54 +00:00
meaz 882ae50c89 antilopa's suggestion into other language page 2021-02-13 06:10:34 +01:00
meaz 611ac540c4 Merge branch 'master' into contact_gpg 2021-02-13 04:57:20 +00:00
antilopa 9c3f317367 suggestion for better layout 2021-02-12 21:09:03 +01:00
antilopa 027fec6c0f Merge pull request 'Remove badge from services' (#189) from badge into master
Reviewed-on: Disroot/Website#189
2021-02-12 19:43:08 +00:00
antilopa 546955e508 Merge pull request 'fix error with grub when using vagrant' (#193) from vagrant_grub into master
Reviewed-on: Disroot/Website#193
2021-02-12 19:39:53 +00:00
meaz e19910ab3c Merge branch 'master' into badge 2021-02-09 21:45:47 +00:00
meaz 6592f11d51 Merge branch 'master' into contact_gpg 2021-02-09 21:45:07 +00:00
meaz 19c9560579 Merge branch 'master' into vagrant_grub 2021-02-09 21:44:44 +00:00
meaz 8cb01a13e6 Merge pull request 'change Attachement size limit info to 64MB' (#191) from email_size into master
Reviewed-on: Disroot/Website#191
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-02-09 21:44:14 +00:00
meaz ecc4d0704b fix error with grub when using vagrant 2021-02-09 22:43:10 +01:00
meaz 407990f10d Update contact with new gpg key for cryptdisroot 2021-02-09 22:40:29 +01:00
meaz ec9e2ba313 Merge branch 'master' into email_size 2021-02-09 05:47:25 +00:00
meaz d2d431b34c Merge pull request 'Choose what Grav version to install + minors improvments / if statement' (#190) from bootstrap into master
Reviewed-on: Disroot/Website#190
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-02-09 05:46:19 +00:00
meaz cbd0fdcfc6 change from 70 to 64 in case the calculation of the message size is off 2021-02-07 08:37:17 +01:00
meaz bfcbd48d2d change Attachement size limit info to 70MB 2021-02-07 08:34:42 +01:00
meaz 0b630c479d Choose what Grav version to install + minors improvments / if statement 2021-02-06 00:20:12 +01:00
meaz 223f2e0776 Remove badge from services 2021-02-04 06:34:53 +01:00
Fede.- 68238d1e38 Blogpost Spanish translation + fixed minor typos in English (#188)
Blogpost Spanish translation + fixed minor typos in English

Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: Disroot/Website#188
Co-Authored-By: Fede.- <fede@no-reply@disroot.org>
Co-Committed-By: Fede.- <fede@no-reply@disroot.org>
2020-12-31 17:07:59 +00:00
meaz 8cbcf4c100 Merge pull request 'blog post end 2020' (#187) from muppwrite into master
Reviewed-on: Disroot/Website#187
2020-12-31 10:58:01 +00:00
muppeth ffd65186db blog post end 2020 2020-12-31 11:20:29 +01:00
muppeth 09ba743ce3 emergancy push to update microshit blog post 2020-12-29 12:02:32 +01:00
meaz 61dfab4d54 Merge pull request '[Blog-it] Translate sticker contest post' (#185) from blog-it-sticker into master
Reviewed-on: Disroot/Website#185
2020-12-15 13:01:07 +00:00
l3o a37a02316b [Blog-it] Translate sticker contest post 2020-12-15 13:45:51 +01:00
meaz 1f0b6391cc Stickers contest blog post (#184)
color adjustment on image

Added hashtag + Spanish translation

change merch to gift

Fede's suggestions

Few small fixes

Stickers contest blog post

Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-on: Disroot/Website#184
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-12-08 15:12:06 +00:00
meaz 441c3ca33e Merge pull request 'add tagcloud plugin to vagrant + info about language-selector' (#182) from meazdev into master
Reviewed-on: Disroot/Website#182
2020-12-05 23:19:20 +00:00
meaz face1b7435 add tagcloud plugin to vagrant + info about language-selector 2020-12-06 00:17:27 +01:00
meaz 8c388fafe2 Merge pull request 'Update to debian10' (#181) from debian10 into master
Reviewed-on: Disroot/Website#181
2020-12-05 22:45:31 +00:00
meaz 6bc4f1fef5 Merge branch 'master' into debian10 2020-12-05 23:37:32 +01:00
meaz c4ba122df4 Merge pull request 'Remove Diaspora from FAQ' (#180) from meazdev into master
Reviewed-on: Disroot/Website#180
2020-12-05 22:27:19 +00:00
meaz 83829622fa Remove Diaspora from FAQ 2020-12-05 23:25:49 +01:00
meaz bcbc3d4d9b Merge pull request 'remove matrix from FAQ' (#179) from meazdev into master
Reviewed-on: Disroot/Website#179
2020-12-05 22:03:45 +00:00
meaz b4ac5a9903 remove matrix from FAQ 2020-12-05 23:01:20 +01:00
meaz 5de456a08b Merge pull request 'Fix link from FAQ to 2FA' (#178) from meazdev into master
Reviewed-on: Disroot/Website#178
2020-12-05 21:54:19 +00:00
meaz f3d48ad7fc Merge branch 'master' into meazdev 2020-12-05 21:53:56 +00:00
meaz ca85e35d53 Fix link from FAQ to 2FA 2020-12-05 22:52:32 +01:00
meaz 74ce93fefb Merge pull request 'Fix typos' (#177) from meazdev into master
Reviewed-on: Disroot/Website#177
2020-12-05 21:48:34 +00:00
meaz 0a2685e4ab Fix typos 2020-12-05 22:47:15 +01:00
meaz d0627fa6d6 Merge pull request 'change double quotes by single ones' (#175) from fix_russian into master
Reviewed-on: Disroot/Website#175
2020-11-25 21:10:47 +00:00
meaz 82e1b58a64 change double quotes by single ones 2020-11-25 22:09:32 +01:00
meaz c4da86b148 Merge pull request 'FAQ translated to Russian language' (#174) from acetone/Website:master into master
Reviewed-on: Disroot/Website#174
2020-11-23 13:08:54 +00:00
acetone 1ca8fe8efa more Russian correctly 2020-11-23 08:26:43 +03:00
acetone 48b00c8020 green energy and other bit corrects 2020-11-23 08:19:21 +03:00
acetone a3b50ff089 Merge branch 'master' into master 2020-11-23 05:13:54 +00:00
meaz 813e5336a5 Merge pull request 'add green badge' (#142) from green_badge into master
Reviewed-on: Disroot/Website#142
2020-11-22 20:40:23 +00:00
meaz 16a20c27f0 Merge branch 'master' into green_badge 2020-11-22 20:39:56 +00:00
acetone d1535eb2a4 for nice look 2020-11-22 21:03:55 +03:00
acetone d77a69e5d5 Merge branch 'master' into master 2020-11-22 16:26:51 +00:00
acetone d8ccb141ff hardware donations 2020-11-22 19:18:00 +03:00
acetone d740f65cb2 endless edits 2020-11-22 19:08:03 +03:00
acetone fa26a358cc More correct russian language 2020-11-22 18:58:26 +03:00
acetone d462a5c3a6 FAQ translated to Russia language 2020-11-22 15:38:14 +03:00
meaz 4928ebf716 Merge pull request 'Translated main pages to russian language' (#173) from acetone/Website:master into master
Reviewed-on: Disroot/Website#173
2020-11-22 10:46:22 +00:00
acetone de6699c420 "Мы" instead "О нас" 2020-11-22 13:41:43 +03:00
acetone 4aa4a9ffeb I hate Windows standard encoding. Ave UTF-8! 2020-11-22 13:30:56 +03:00
acetone b1972d1bf6 God save the Putin and russian symbol encoding 2020-11-22 13:24:37 +03:00
acetone 754d528834 Encoding symbols correct 2020-11-22 10:17:26 +00:00
acetone bbab805d0e DisrootTeam and Transparency 2020-11-22 13:12:10 +03:00
acetone 8aed6fa4c7 Corrected russian translate 2020-11-22 12:50:03 +03:00
acetone 73b5738da8 Synchronization 2020-11-22 12:45:18 +03:00
acetone 0af32399c1 in process... 2020-11-22 12:44:45 +03:00
acetone 07a0d464d5 Merge branch 'master' into master 2020-11-22 09:31:49 +00:00
meaz 451b48bcc3 Updated the monthly overview for few month, corrected the donation graph (#172) 2020-11-21 21:26:37 +00:00
acetone 4271367909 oops:) 2020-11-21 18:22:02 +03:00
acetone 5f2ee27a31 acetone with love from Russia 2020-11-21 18:18:28 +03:00
antil0pa 79e70e6e67 Updated the monthly overview for few month, corrected the donation graph 2020-11-21 10:42:30 +01:00
meaz 24b8026382 Merge pull request 'disabled forms, added line on contact page about chat bridge' (#171) from muppdev into master
Reviewed-on: Disroot/Website#171
2020-11-15 07:55:52 +00:00
muppeth 4facb4615b disabled forms, added line on contact page about chat bridge 2020-11-15 08:40:43 +01:00
meaz c78b193336 Merge pull request 'readme_vagrant' (#168) from readme_vagrant into master
Reviewed-on: Disroot/Website#168
2020-11-15 06:25:39 +00:00
meaz 7616f6cb43 Merge branch 'master' into readme_vagrant 2020-11-15 06:25:13 +00:00
meaz 59c5abd458 Merge branch 'master' into green_badge 2020-11-15 06:23:30 +00:00
meaz 7212b16d40 Merge pull request 'fix yahoo' (#170) from quick_fix into master
Reviewed-on: Disroot/Website#170
2020-11-07 18:09:00 +00:00
meaz ae0c7a1c09 fix yahoo 2020-11-07 19:07:25 +01:00
meaz 0d55f88147 Merge pull request 'Blog post about MS issue' (#164) from MS into master
Reviewed-on: Disroot/Website#164
2020-11-07 17:17:10 +00:00
meaz ccc1c6c4fa Merge branch 'master' into MS 2020-11-07 17:02:16 +00:00
Fede.- f28bd16f44 Merge pull request 'update not EN contact pages with NC Talk' (#167) from contact_NC into master
Reviewed-on: Disroot/Website#167
2020-11-07 13:29:12 +00:00
Fede.- a68e57dd80 Updated Spanish translation and minor fixes on English post 2020-11-07 10:23:58 -03:00
meaz 395ea4f058 Remove the blocking part + some fixes 2020-11-07 05:20:09 +01:00
meaz 553db9c2cb replace yahoo by hotmail 2020-10-28 09:09:43 +01:00
meaz 3633b8957b bump vagrant to 2.10 version 2020-10-28 09:04:09 +01:00
meaz 7fbf918cf0 add disroot blog link 2020-10-28 08:42:11 +01:00
Fede.- 6b848975b2 Small fixes on text, added MS support contact page 2020-10-27 16:54:08 -03:00
Fede.- c4ef5f3e36 Merge branch 'MS' of https://git.disroot.org/Disroot/Website into MS 2020-10-27 16:00:06 -03:00
Fede.- 9d9c1e6969 Spanish translation of MS post 2020-10-27 15:55:21 -03:00
Fede.- efb026f6c2 MS post
Few typos fixed
2020-10-27 15:55:21 -03:00
meaz 302e89eb81 Blog post about MS issue 2020-10-27 15:55:21 -03:00
meaz ba8ed68809 update not EN contact pages with NC Talk 2020-10-27 11:28:47 +01:00
antilopa c3a9473d52 Merge pull request 'adds Nextcloud Talk link on contact page' (#165) from nextcloud_contact into master
Reviewed-on: Disroot/Website#165
2020-10-26 12:50:34 +00:00
antilopa 5bc48936cc Merge branch 'master' into nextcloud_contact 2020-10-26 12:50:05 +00:00
antilopa f858fef529 Merge pull request 'blog_vagrant' (#166) from blog_vagrant into master
Reviewed-on: Disroot/Website#166
2020-10-26 12:48:11 +00:00
meaz 7cb17c76d5 Add themer annd fix wwwuser var 2020-10-25 00:15:21 +02:00
meaz d8e6507550 add missing / 2020-10-24 23:44:03 +02:00
meaz 46aef7ea7e add blog repo to vagrant 2020-10-24 23:16:17 +02:00
meaz 2802b37a6c adds Nextcloud Talk link on contact page 2020-10-24 11:11:50 +02:00
meaz c6be15469d Change yahoo by hotmail 2020-10-23 18:56:41 +02:00
Fede.- 9f3c3c5243 Spanish translation of MS post 2020-10-23 09:43:03 -03:00
Fede.- 18e520619d MS post
Few typos fixed
2020-10-23 12:31:13 +00:00
meaz 00557444b0 Blog post about MS issue 2020-10-23 12:05:41 +02:00
meaz b2a676407b Merge pull request 'Spanish blogpost translation' (#163) from WEBSITE_BLOG_10_14_ES into master
Reviewed-on: Disroot/Website#163
2020-10-16 04:33:54 +00:00
Fede.- b16e3b34d0 Spanish translation for Roadmap 4T post 2020-10-15 15:05:57 -03:00
Fede.- 4665b31f80 Merge branch 'WEBSITE_BLOG_10_14_ES' of https://git.disroot.org/Disroot/Website into WEBSITE_BLOG_10_14_ES 2020-10-15 15:04:50 -03:00
Fede.- b3e433f4c1 Spanish blogpost translation 2020-10-15 14:47:05 -03:00
meaz 520599e72c Merge branch 'master' into WEBSITE_BLOG_10_14_ES 2020-10-15 13:36:59 +00:00
Fede.- e6aad5e508 Merge pull request 'roadmap q4 2020' (#162) from muppdev into master
Reviewed-on: Disroot/Website#162
2020-10-15 11:53:56 +00:00
Fede.- 2537117d5b Small fixes on posts links 2020-10-15 08:52:43 -03:00
Fede.- 5991f35c88 Spanish blogpost translation 2020-10-14 17:05:06 -03:00
muppeth 834b84ee9f roadmap q4 2020 2020-10-14 21:11:38 +02:00
muppeth 80e7d7f1a4 small fix to the blog post 2020-10-14 19:21:14 +02:00
meaz 266dae99ea Merge pull request 'switching some light off blog post' (#161) from muppdev into master
Reviewed-on: Disroot/Website#161
2020-10-14 16:20:14 +00:00
muppeth 56dc641bac switching some light off blog post 2020-10-14 08:28:50 +02:00
meaz 22394c40b4 Merge pull request 'blog-it-NC-deck' (#160) from blog-it-NC-deck into master
Reviewed-on: Disroot/Website#160
2020-09-16 12:17:28 +00:00
l3o 560a2d4a46 Blog Deck - it translation - last part 2020-09-16 10:40:32 +02:00
l3o e21458ce99 Blog "Deck" - it translation - fixed some small mistake 2020-09-16 10:34:12 +02:00
l3o 593a449388 Blog "Deck" - it translation 2020-09-16 10:29:23 +02:00
l3o 60424c09b9 IT- traduction 2020-09-14 21:33:16 +02:00
l3o 9f565a2be2 Start translation it 2020-09-14 21:18:09 +02:00
Fede.- 1b2a23e292 Header image fix
Reviewed-on: Disroot/Website#159
2020-09-14 12:18:31 +00:00
Fede.- 119d679ffa Merge branch 'deck_post' of https://git.disroot.org/Disroot/Website into deck_post 2020-09-14 09:17:28 -03:00
Fede.- beed451478 Header image fix 2020-09-14 09:17:18 -03:00
Fede.- 3031ffce78 Header image fix 2020-09-14 09:13:43 -03:00
Fede.- d8c0379eec Fixed header image 2020-09-14 11:55:28 +00:00
Fede.- 6fcdce971e Merge pull request 'NC Deck blogpost by AvJoe' (#158) from deck_post into master
Reviewed-on: Disroot/Website#158
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-09-14 11:32:00 +00:00
Fede.- fa6482e9f3 NC Deck blogpost by AvJoe 2020-09-12 12:32:27 -03:00
meaz 12af2453d8 Merge pull request 'Blog it-translation first half of 2020 and disroot is 5' (#157) from blog-it-first-half-of-2020 into master
Reviewed-on: Disroot/Website#157
2020-08-10 09:44:33 +00:00
l3o e678872a50 Blog it-translation first half of 2020 and disroot is 5 2020-08-10 10:38:43 +02:00
meaz 78de38128c Merge branch 'master' into green_badge 2020-08-09 09:01:08 +00:00
meaz d512097002 move from home to about page + change background color 2020-08-09 10:58:53 +02:00
meaz acec97eb5f Merge pull request 'Website: small updates and fixes plus Blogpost translations' (#156) from Website_Blog_ES_updates into master
Reviewed-on: Disroot/Website#156
2020-08-09 08:31:18 +00:00
Fede.- a52e8c96e8 Website: small updates and fixes plus Blogpost translations 2020-08-09 03:29:19 -03:00
meaz 1a4f70a3d8 blogs - half year 2020;disroot is 5 (#154) 2020-08-07 20:40:15 +00:00
muppeth 264271188e Merge branch 'master' into muppdev 2020-08-07 16:11:23 +00:00
muppeth c88fd9b486 uploaded smaller image of sunflowers 2020-08-07 18:06:04 +02:00
muppeth 726c57bd77 blogs - half year 2020;disroot is 5 2020-08-07 17:59:57 +02:00
antil0pa 7ccf905e52 updated report 2020-08-07 09:28:40 +02:00
meaz 214200cecd Merge pull request '2019 yearly report' (#153) from annual_report_2019 into master
Reviewed-on: Disroot/Website#153
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2020-08-07 06:26:38 +00:00
meaz 664c5028c2 Merge branch 'master' into green_badge 2020-08-07 06:25:34 +00:00
antil0pa 244ef9a6c8 2019 yearly report 2020-08-06 15:01:27 +02:00
antilopa 0a536ee4dd Merge pull request 'xmppbridges' (#151) from xmppbridges into master
Reviewed-on: Disroot/Website#151
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-08-06 12:34:32 +00:00
antil0pa b350419420 new conversations picture 2020-08-06 14:34:08 +02:00
antil0pa 8d6ac56ddf fixed a typo, added a hyperlink. 2020-08-06 14:20:32 +02:00
antilopa 90288ab4f6 Merge branch 'master' into green_badge 2020-08-06 12:16:43 +00:00
antilopa efc52afbba Merge pull request 'goals' (#149) from goals into master
Reviewed-on: Disroot/Website#149
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-08-06 12:08:54 +00:00
antilopa 3fe6e0f156 Merge branch 'master' into goals 2020-08-06 12:07:16 +00:00
meaz f6e54921c2 Merge pull request 'Fixed some spelling mistakes [English/Services/PrivateBin]' (#152) from lampenit/Website:master into master
Reviewed-on: Disroot/Website#152
2020-08-01 05:45:46 +00:00
lampenit e7a0dff300 Fixed some spelling mistakes 2020-07-20 14:18:06 +00:00
meaz d4a083ed91 Merge branch 'master' into goals 2020-07-18 19:17:16 +00:00
meaz 052494f227 Merge branch 'master' into green_badge 2020-07-17 06:34:55 +00:00
meaz 10703c943d Merge branch 'master' into xmppbridges 2020-07-17 06:33:20 +00:00
meaz aa6cd795b7 Merge pull request 'about' (#150) from about into master
Reviewed-on: Disroot/Website#150
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-07-17 05:13:04 +00:00
meaz fa6aac2726 improve how matrix syntax is displayed 2020-07-13 17:31:46 +02:00
meaz 424e347857 add info about Disroot team 2020-07-13 17:24:00 +02:00
meaz 7078fbe4a9 Add syntax for Matrix 2020-07-11 00:06:01 +02:00
meaz 327cec52ac add syntax info for IRC channels 2020-07-10 23:28:44 +02:00
meaz fe32a3042e add bgcolor 2020-07-10 21:36:00 +02:00
meaz a76799446c add avatars 2020-07-10 10:29:07 +02:00
meaz bb32896f7f add donated graph in section, remove it in tile 2020-07-10 09:48:01 +02:00
antil0pa e5812374fb small adjustments to text 2020-07-06 14:07:21 +02:00
meaz c74b7f3d92 readd deleted image! 2020-06-27 15:39:34 +02:00
meaz c85871353e create goals tiles + change blocks order 2020-06-27 15:35:21 +02:00
meaz 6195e8a4b1 Merge pull request 'finacial overview till may 2020' (#147) from financial_overview_jun2020 into master 2020-06-05 18:50:27 +00:00
antil0pa fe85f0992c finacial overview till may 2020 2020-06-05 16:58:52 +02:00
antilopa 6a84a4f969 Merge pull request 'improve info about NC key resetting' (#131) from Faq into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-05-27 10:54:15 +00:00
antilopa 0b065b5a0d Merge pull request 'Add mumble clients in En and Fr' (#141) from mumble_clients into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-05-27 10:52:50 +00:00
l3o 26882c74ff Translated blog article: Roundcube (#146)
Translated blog article: Roundcube

Co-authored-by: l3o <l3o@disroot.org>
2020-05-21 12:50:38 +00:00
meaz dfff9295cd Merge pull request 'Roundcube announcement' (#145) from roundcube_post into master
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-05-20 09:24:14 +00:00
Fede.- 243287b995 Roundcube announcement 2020-05-20 01:31:05 -03:00
antil0pa d26c785cb3 updated git settings 2020-05-08 11:32:29 +02:00
antilopa 193ae70991 Merge pull request 'Update donation address' (#143) from update_donation_page into master 2020-05-08 09:29:14 +00:00
antil0pa f95f7bf6b1 Update donation address 2020-05-08 11:26:30 +02:00
meaz 8018111118 change location of badge + fix error with bkground 2020-04-22 11:47:00 +02:00
meaz acf0a1b654 add green badge 2020-04-22 11:34:12 +02:00
meaz 4aa28acc1f Add mumble clients in En and Fr 2020-04-21 07:09:56 +02:00
meaz 6a5b83ab6e Merge pull request 'IT traduction - blog flisol' (#140) from IT-blog-flisol into master 2020-04-16 12:57:08 +00:00
l3o 887dbc1376 IT traduction - blog flisol 2020-04-16 14:42:06 +02:00
meaz 9e4095f4fc Merge pull request 'Post about Flisol' (#139) from flisol_blogpost into master 2020-04-14 06:47:23 +00:00
Fede.- fa042ff879 Post about Flisol 2020-04-14 02:40:53 -03:00
antilopa bb30628f32 Merge pull request 'fix wrong closing </a>' (#138) from faq into master 2020-04-13 12:25:23 +00:00
meaz 13b1651797 fix wrong closing </a> 2020-04-08 12:10:22 +02:00
meaz f6047b420f Merge pull request 'IT traduction covid19' (#137) from IT-covid19 into master 2020-04-06 05:20:51 +00:00
l3o 408a9b26d2 IT traduction covid19 2020-04-05 21:11:36 +02:00
muppeth 2260f8a639 fix de (#136)
fix de

Co-authored-by: muppeth <muppeth@disroot.org>
2020-04-04 18:45:48 +00:00
muppeth 21c11f74ca remove de from pastebin (#135)
remove de from pastebin

Co-authored-by: muppeth <muppeth@disroot.org>
2020-04-04 18:43:30 +00:00
meaz c52edfa99d Merge pull request 'remove new badge from games tile' (#134) from remove_new into master 2020-04-01 10:14:13 +00:00
antil0pa fcb4550c3c remove new badge from games tile 2020-04-01 12:07:13 +02:00
meaz 4a2adf1d4b Merge pull request 'Kit: Spanish update for English fixes' (#129) from WEBSITE_SP_Fixes into master 2020-04-01 04:38:58 +00:00
meaz fd8238a098 Merge pull request 'WEBSITE_Blogpost_ES' (#133) from WEBSITE_Blogpost_ES into master 2020-04-01 04:36:14 +00:00
Fede.- 86504d8914 Fixed typo
Fixed a typo
2020-03-31 20:48:06 +00:00
Fede.- f20283947f Spanish translation of blogpost 2020-03-31 17:40:22 -03:00
Fede.- 494f770c5a Merge pull request 'covid19 kit blog post.' (#132) from covid19-kit into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-03-31 20:29:28 +00:00
muppeth 8f29354e00 covid19 kit blog post. 2020-03-31 22:22:06 +02:00
Fede.- e6831f21a7 Merge branch 'WEBSITE_SP_Fixes' of https://git.disroot.org/Disroot/website into WEBSITE_SP_Fixes 2020-03-31 09:08:39 -03:00
Fede.- 6a47de815a Spanish fixes 2020-03-31 09:07:30 -03:00
Fede.- 3a811c34f9 Spanish fixes 2020-03-31 09:06:32 -03:00
Fede.- 976bb9d7d7 Kit: Spanish update for English fixes 2020-03-31 09:05:53 -03:00
Fede.- ce02c8d8b2 Spanish fixes 2020-03-31 08:58:49 -03:00
Fede.- e87f448f26 Merge pull request 'french_covid' (#130) from french_covid into master 2020-03-31 11:53:02 +00:00
meaz 9360c7d7a5 improve info about NC key resetting 2020-03-31 12:43:19 +02:00
meaz 3fe3a223a3 French translation of cryptpad service page 2020-03-31 10:46:41 +02:00
meaz 384e6c7a84 remove mention of email on cryptpad 2020-03-31 10:41:59 +02:00
meaz 0a15232182 French translation of Mumble service page 2020-03-31 10:37:44 +02:00
meaz 8197b4e755 remove a space character 2020-03-31 10:29:14 +02:00
meaz 6f39a3f3ae franch translation of Quarantine page 2020-03-31 10:27:50 +02:00
meaz af6f0a8b49 added new services in other languages 2020-03-31 10:22:26 +02:00
meaz 85ce0333d6 French translation of new services 2020-03-31 10:22:14 +02:00
meaz 35ccda599a French translation of covid page 2020-03-31 10:22:04 +02:00
Fede.- 4f6d6ddbfb Games links fixed 2020-03-31 03:05:37 -03:00
Fede.- dc4ba43bdc Kit: Spanish update for English fixes 2020-03-31 02:55:26 -03:00
maryjane 9a08582192 Merge pull request 'fix a link + add cryptpad' (#128) from fix_covid19 into master
Adds cryptad to the COVID19 page and corrects a link in the same page in the Game section
2020-03-30 17:34:35 +00:00
meaz e01c1b27de fix a link + add cryptpad 2020-03-30 19:29:03 +02:00
meaz 3af93f5e3d Merge pull request 'Spanish updates of website pages + Fixed Mumble address on Eng version' (#127) from WEBSITE_SP_Updates into master 2020-03-30 15:52:55 +00:00
Fede.- 4618730c3d Merge branch 'WEBSITE_SP_Updates' of https://git.disroot.org/Disroot/website into WEBSITE_SP_Updates 2020-03-30 10:00:24 -03:00
Fede.- 6f7ec4c5b1 Spanish updates of website pages + Fixed Mumble address on Eng version
Rebase from master to SP branch
A
D
C
Rebase of master into SP branch#
2020-03-30 09:32:41 -03:00
antilopa defdd2200f Merge pull request 'Changed name in menu for covid19 kit page' (#125) from covid_19_kit into master 2020-03-30 12:13:34 +00:00
antil0pa 20f8dbc9e8 Merge branch 'master' into covid_19_kit 2020-03-30 14:09:49 +02:00
antil0pa 5c818087e6 Merge branch 'covid_19_kit' of git.disroot.org:Disroot/Website into covid_19_kit 2020-03-30 14:05:18 +02:00
antil0pa a686e138cb reorganize cvid-19 tiles 2020-03-30 14:05:16 +02:00
antil0pa 903bf28d1c reorganize cvid-19 tiles 2020-03-30 14:01:20 +02:00
Fede.- bbce6eb31f Spanish updates of website pages + Fixed Mumble address on Eng version 2020-03-30 08:57:59 -03:00
maryjane a1f107d7e7 Merge pull request 'new_service_correction' (#126) from new_service_correction into master
Fixing link and adding information
2020-03-30 09:56:35 +00:00
meaz ed29c3af05 fix bg color 2020-03-30 11:55:19 +02:00
meaz 776e434c0b fix links 2020-03-30 11:36:11 +02:00
meaz 9637f4acf1 add info about cryptpad project 2020-03-30 11:36:05 +02:00
meaz 81d278d4f8 add service tile for games 2020-03-30 11:22:54 +02:00
meaz 94ca5da3d6 Merge pull request 'home_services' (#124) from home_services into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-03-30 08:44:37 +00:00
antil0pa abaa9e8e30 Changed name in menu for covid19 kit page 2020-03-30 10:15:53 +02:00
meaz 55c52dfa1c remove forgotten test badge 2020-03-29 07:56:20 +02:00
meaz 053fd18f8d add Experimental badge on mumble and cryptpad tiles 2020-03-29 07:44:20 +02:00
meaz d72a9a13a3 add mumble and cryptpad an home page list of services 2020-03-29 07:43:37 +02:00
Fede.- e937b779f3 Merge pull request 'quarantine_services' (#122) from quarantine_services into master
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-03-28 21:36:03 +00:00
meaz 95b2ab41d3 corrects a typo + remove text already written on another page 2020-03-28 06:40:35 +01:00
meaz 81d840e766 small typos 2020-03-28 06:40:08 +01:00
meaz 95b339f0fb change image for mumble 2020-03-28 06:30:18 +01:00
meaz 9b15a22a7d Change to "Disroot Covid-19 Kit" 2020-03-28 06:24:43 +01:00
meaz 08db9bd204 Correct a typo 2020-03-28 06:24:16 +01:00
muppeth fac163e1c7 cryptpad page. 2020-03-27 21:24:42 +01:00
meaz b6b0c86511 Merge pull request 'financial_overview_JM2020' (#123) from financial_overview_JM2020 into master 2020-03-27 10:20:55 +00:00
antil0pa 3332786a3a Overview Jan-Feb 2020 2020-03-27 11:15:18 +01:00
antil0pa 92808e771b Adjusted the DNS record settings as pointed out in
Ticket# 884328
2020-03-26 17:28:58 +01:00
Fede.- c54de515c7 Merge pull request 'change "e2e issue with NC" text' (#116) from NCe2e into master 2020-03-26 14:04:30 +00:00
Fede.- 3e4ea957d5 Minor fix on text 2020-03-25 22:02:15 +00:00
meaz 88f77f5d1a add quaratantine page 2020-03-25 22:45:28 +01:00
meaz 4ef451d747 add mumble service 2020-03-25 22:45:15 +01:00
muppeth 1fc619d417 typo in quarantine 2020-03-20 15:27:30 +01:00
antilopa a125d97bd0 Merge pull request 'Quarantine with disroot' (#120) from quarantine into master 2020-03-20 10:03:11 +00:00
muppeth 094a881996 Quarantine with disroot 2020-03-20 10:58:16 +01:00
meaz 864a20e54e Merge pull request 'SP translation of blogpost + git links added + EN typos and style fixes' (#119) from WEBSITE_Blogpost_ES into master 2020-03-17 08:58:48 +00:00
Fede.- e158b45c3f Actualizar 'pages/07.blog/this_year_couldnt_become_any_crazier/item.es.md' 2020-03-16 20:18:43 +00:00
Fede.- de6afbc7d6 SP translation of blogpost + git links added + EN typos and style fixes 2020-03-16 16:40:04 -03:00
antilopa e7d8072c76 Merge pull request 'add blog post text + img' (#111) from 2020_sprint into master 2020-03-16 17:05:42 +00:00
Muppeth 77bcd89e94 changed the text a little; removed screenshots form nextcloud;new pic. 2020-03-16 17:57:48 +01:00
antilopa 6023fe5a36 Merge pull request 'Website adjustments for new privacy policy branch' (#118) from privacy_policy into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2020-03-13 10:56:13 +00:00
antil0pa ba7822e3ab add gitignore to tos directory 2020-03-12 13:16:36 +01:00
antil0pa 4031ce72e9 Merge branch 'privacy_policy' of git.disroot.org:Disroot/Website into privacy_policy 2020-03-12 13:12:24 +01:00
antil0pa 09eb9af595 fixed tos to pull content from tos repo 2020-03-12 13:12:10 +01:00
meaz 2162ec2d10 update text 2020-03-11 22:08:06 +01:00
meaz c3dda6dd6c update vagrant with privacy statement repo 2020-03-11 14:06:01 +01:00
antil0pa e8d0311f0d top anchor in title 2020-03-11 11:59:24 +01:00
antil0pa 3ebbde1981 added title 2020-03-11 11:56:56 +01:00
antil0pa fb3977988a Website adjustments for new privacy policy branch 2020-03-11 11:31:13 +01:00
meaz f932c8929b change e2e issue with NC text 2020-03-09 18:10:51 +01:00
meaz 261e3f953d update blog post with NC 18 + coz we're not in february anymore! 2020-03-08 11:56:28 +01:00
meaz 8191275e83 Merge branch 'kill_diaspora' of Disroot/Website into master 2020-03-06 10:06:21 +00:00
Muppeth 7c3bc3148a remove diaspora page form the website 2020-03-06 00:00:39 +01:00
meaz d413a719be Merge branch 'WEBSITE_FAQ_FRONT_ES_Updates_Fixes' of Disroot/Website into master 2020-02-29 20:14:38 +00:00
Fede.- c64b364cd6 Some minor translations updates on FAQ + Donations&DisApp on frontpage 2020-02-29 16:55:58 -03:00
antilopa 3d07016afa Merge branch 'postfix_issue' of Disroot/Website into master 2020-02-27 21:11:55 +00:00
meaz f3ced696d1 Fix problem in vagrant file with postfix configuration screen 2020-02-18 09:56:48 +01:00
antilopa 46d69205b9 Merge branch 'disapp' of Disroot/Website into master 2020-02-16 12:31:13 +00:00
antil0pa 51e873b1e4 cosmetics 2020-02-16 13:25:22 +01:00
antil0pa b6b3335aaf Update to debian10 2020-02-16 12:18:06 +01:00
meaz 0c798989cf Merge branch 'WEBSITE_services_calls_de' of Disroot/Website into master 2020-02-10 06:46:28 +00:00
shadowsword 1db029fe1c calls translated to german
+some minor fixes
2020-02-09 22:47:01 +01:00
Fede.- f7bddea8aa Revert "Merge branch 'privacy_statement_v1_2' of Disroot/Website into master"
This reverts commit 026fc6e310, reversing
changes made to f398a932ac.

Rolling back to previous stage
2020-02-09 15:41:35 -03:00
meaz bb11564a2b add blog post text + img 2020-02-09 19:17:58 +01:00
meaz b32cb3addc ad bkground color to fix displaying 2020-02-09 12:52:30 +01:00
meaz bcc5da5892 add disapp section on home page + fdroid icon 2020-02-09 12:50:32 +01:00
meaz 1b4fdee124 change bg color + add disapp section 2020-02-09 12:49:21 +01:00
meaz 026fc6e310 Merge branch 'privacy_statement_v1_2' of Disroot/Website into master 2020-02-08 21:22:55 +00:00
Fede.- e7f7bdbfc6 Update of Privacy Statement and Terms of use + Spanish translations of them 2020-02-07 02:38:21 -03:00
meaz f398a932ac update xmpp link with xmpp:room?join on contact page 2020-02-05 17:47:23 +01:00
Fede.- 68fa66dc20 Merge branch 'WEBSITE_email_de' of Disroot/Website into master 2020-02-05 11:26:15 +00:00
shadowsword 571e1c86cc german translation of email delimiters section
some minor fixes
2020-02-04 22:17:53 +01:00
Fede.- 80dd95c1a9 Merge branch 'internat_donate' of Disroot/Website into master 2020-02-03 21:23:21 +00:00
meaz 319694df68 Merge branch 'IT-email_storage' of Disroot/Website into master 2020-02-03 15:50:19 +00:00
l3o 322d764173 Email extra storage translation 2020-02-03 15:31:36 +01:00
meaz 4176082cc6 add more info for delimiters in EN + other languages 2020-02-02 11:37:32 +01:00
meaz 1b47d1e467 internatization of home page / donate section 2020-02-02 11:10:42 +01:00
meaz 78a111fea9 update links in vagrant readme 2020-02-02 11:09:27 +01:00
meaz c0c9ea93cd update website repo address 2020-01-31 11:33:34 +01:00
antil0pa a7bd33ae11 corrected error in expenses graph 2020-01-29 11:24:29 +01:00
Fede.- 8b5e3c70f8 Merge branch 'financial_overview_2019' of Disroot/Website into master
Financial Overview Update
2020-01-27 22:35:55 +00:00
antil0pa 97624151be updated overview for 2019 2020-01-27 22:33:57 +01:00
antil0pa 7996805a22 chane of color 2020-01-27 21:57:29 +01:00
antilopa ffa980968b Merge branch 'reward' of Disroot/Website into master 2020-01-27 20:41:46 +00:00
antil0pa fd0069c895 type setting 2020-01-27 21:40:05 +01:00
meaz 370ef3d8e1 Merge branch 'WEBSITE_ES_Update' of Disroot/Website into master 2020-01-25 07:47:43 +00:00
meaz 4419c1e3e2 Merge branch 'WEBSITE_blog_de' of Disroot/Website into master 2020-01-25 07:15:27 +00:00
shadowsword 505d934c14 Blogpost "Demise-Diaspora" translation to german 2020-01-24 22:49:52 +01:00
Fede.- 51d0784d54 Spanish website & Blogpost translations updates + Few minor English typos 2020-01-24 16:28:42 -03:00
antil0pa e420b04e18 changed text to markdown 2020-01-22 22:27:09 +01:00
meaz 7c498e9599 add reward informations on home page 2020-01-22 14:00:56 +01:00
meaz 6ed8ab61b0 add id sections so that we can use anchor with links 2020-01-22 14:00:29 +01:00
meaz 7d5c96fd7f Merge branch 'IT-translation_gitea' of Disroot/Website into master 2020-01-22 12:36:14 +00:00
meaz 56169f0405 Merge branch 'WEBSITE_service_ger' of Disroot/Website into master 2020-01-22 12:35:12 +00:00
shadowsword 8e94cfc570 gitea service translation to german 2020-01-21 22:49:00 +01:00
l3o 50eea50cea IT-translation Last check, ready to merge 2020-01-21 17:02:28 +01:00
l3o 5a80f77df9 IT translation git pages 2020-01-21 16:59:44 +01:00
meaz 55b0119472 Merge branch 'IT-blog-new-road-map' of Disroot/Website into master 2020-01-21 14:44:26 +00:00
l3o 806d6966a6 IT translation Last mistake fixed. Ready to merge 2020-01-21 14:37:50 +01:00
l3o bf0695083b It translation - fixed small language mistake 2020-01-21 14:31:11 +01:00
l3o 306e34a928 IT translation new road map finished 2020-01-21 14:28:20 +01:00
antilopa 11afac4500 Merge branch 'gitea_french' of Disroot/Website into master 2020-01-21 08:50:53 +00:00
l3o c719cdd53d It translation continued 2020-01-20 21:41:50 +01:00
l3o a39a9291f1 Start IT blog translation 2020-01-20 15:29:25 +01:00
meaz 1cf86116ee fix issue with jitsi icon on es, fr and de version 2020-01-20 14:46:54 +01:00
meaz 1e92d1d976 Add git tile to other languages 2020-01-20 14:21:11 +01:00
meaz 514981ae57 French translation of gitea service page 2020-01-20 14:20:11 +01:00
antilopa 44c07eb76a Merge branch 'gitea' of Disroot/Website into master 2020-01-20 11:38:09 +00:00
Muppeth 4357284855 Quick Fix - removed additional h1 in the beggining of the texts 2020-01-20 11:42:48 +01:00
meaz 463cd78193 blog_posts_2020 (#95) 2020-01-20 10:32:16 +00:00
antil0pa ffa0c03b78 removed quote marks 2020-01-20 08:41:21 +01:00
meaz fd9a7e3174 add git service tile in home page 2020-01-19 11:30:57 +01:00
antilopa 11b2c47c08 Merge branch 'contact_pgp' of Disroot/Website into master 2020-01-15 14:41:16 +00:00
meaz bc7cd42fa3 remove one key server + fix key server link not working 2020-01-12 19:09:49 +01:00
meaz 585387500d Create gitea service page 2020-01-12 18:25:58 +01:00
meaz faa7baf0a9 fix bgcolor on tos 2020-01-12 08:11:15 +01:00
meaz 2f050dd495 Merge branch 'droot_fixed' of Disroot/Website into master 2020-01-10 06:59:52 +00:00
antil0pa f6560717c5 root in fixed position 2020-01-09 11:02:56 +01:00
antilopa a9a5fa14e4 Merge branch 'two_col_fix' of Disroot/Website into master 2020-01-08 21:26:54 +00:00
antil0pa b8173e6014 forgotten 2col pages 2020-01-08 21:30:14 +01:00
antil0pa 53f7ff06c9 Privacy policy bottom page fix 2020-01-08 16:10:38 +01:00
antil0pa 5bb11b9d14 Major update to all two columns pages and other minor fixes 2020-01-08 16:08:07 +01:00
meaz 507d226b84 Merge branch 'WEBSITE_nextcloud_ger' of Disroot/Website into master 2020-01-07 16:20:28 +00:00
meaz 2c06f27284 Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.de.md'
back to de folder ;)
2020-01-07 16:19:35 +00:00
meaz 062767358e Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.de.md'
back to de folder ;)
2020-01-07 16:19:09 +00:00
meaz 847e3e8edb Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.de.md'
image is in en folder
2020-01-07 16:16:48 +00:00
meaz a3b8ec050a Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.de.md'
images are in en
2020-01-07 16:15:48 +00:00
shadowsword 000a6bc230 Nextcloud changes translated to german 2020-01-06 07:56:30 +01:00
1751 changed files with 21329 additions and 11797 deletions

428
LICENSE Normal file
View file

@ -0,0 +1,428 @@
Attribution-ShareAlike 4.0 International
=======================================================================
Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
Creative Commons Attribution-ShareAlike 4.0 International Public
License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution-ShareAlike 4.0 International Public License ("Public
License"). To the extent this Public License may be interpreted as a
contract, You are granted the Licensed Rights in consideration of Your
acceptance of these terms and conditions, and the Licensor grants You
such rights in consideration of benefits the Licensor receives from
making the Licensed Material available under these terms and
conditions.
Section 1 -- Definitions.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
c. BY-SA Compatible License means a license listed at
creativecommons.org/compatiblelicenses, approved by Creative
Commons as essentially the equivalent of this Public License.
d. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
e. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
f. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
g. License Elements means the license attributes listed in the name
of a Creative Commons Public License. The License Elements of this
Public License are Attribution and ShareAlike.
h. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
i. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
j. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
k. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
l. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
m. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
Section 2 -- Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
a. reproduce and Share the Licensed Material, in whole or
in part; and
b. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
3. Term. The term of this Public License is specified in Section
6(a).
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
5. Downstream recipients.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
b. Additional offer from the Licensor -- Adapted Material.
Every recipient of Adapted Material from You
automatically receives an offer from the Licensor to
exercise the Licensed Rights in the Adapted Material
under the conditions of the Adapter's License You apply.
c. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this
Public License.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
Section 3 -- License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
a. Attribution.
1. If You Share the Licensed Material (including in modified
form), You must:
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of
warranties;
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
b. ShareAlike.
In addition to the conditions in Section 3(a), if You Share
Adapted Material You produce, the following conditions also apply.
1. The Adapter's License You apply must be a Creative Commons
license with the same License Elements, this version or
later, or a BY-SA Compatible License.
2. You must include the text of, or the URI or hyperlink to, the
Adapter's License You apply. You may satisfy this condition
in any reasonable manner based on the medium, means, and
context in which You Share Adapted Material.
3. You may not offer or impose any additional or different terms
or conditions on, or apply any Effective Technological
Measures to, Adapted Material that restrict exercise of the
rights granted under the Adapter's License You apply.
Section 4 -- Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material,
including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
Section 6 -- Term and Termination.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
Section 7 -- Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
Section 8 -- Interpretation.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
=======================================================================
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
Creative Commons may be contacted at creativecommons.org.

View file

@ -1 +1,7 @@
https://disroot.org - site. (need to add licence)
# Disroot.org
https://disroot.org - site
For instructions on cloning & running locally, see [vagrant/README.md](vagrant/README.md)
## License
The content on **Disroot Website** is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)

3
pages/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
privacy_policy/_pp
tos/_tos
cryptocurrency/

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: left
---
<br>
## Get it on [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
---
## Disroot App
Diese App ist wie ein Schweizer Taschenmesser für die **Disroot**-Plattform, gemacht von der Community für die Community. Auch wenn Du kein **Disroot**-Konto hast, kannst Du mit dieser App trotzdem auf alle **Disroot**-Dienste zugreifen, für die kein Konto erforderlich ist. Das sind beispielsweise Etherpad, Upload und andere.

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: right
---
<br>
## Get it on [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
---
## Disroot app
This app is like your Swiss Army knife to the **Disroot** platform, made by the community for the community. If you dont have a **Disroot** account you can still use this app to access all the **Disroot** services that do not require an account, like etherpad, upload, etc.

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: right
---
<br>
## Consíguela en [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/es/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/es/packages/org.disroot.disrootapp/?class=lighter)
---
## La App de Disroot
Es como tu navaja suiza de la plataforma, hecha por la comunidad para la comunidad. Si no tienes una cuenta de **Disroot** aún puedes utilizar esta aplicación para acceder a los servicios que no requieren una, como los Blocs, Subida, etc.

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: left
---
<br>
## Récupérez la sur [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
---
## Application Disroot
Cette application est comme votre couteau suisse de la plateforme **Disroot**, faite par la communauté pour la communauté. Si vous n'avez pas de compte **Disroot**, vous pouvez quand même utiliser cette application pour accéder à tous les services **Disroot** qui ne nécessitent pas de compte, comme etherpad, upload, etc.

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: left
---
<br>
## Scaricala da [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
---
## Disroot app
Questa app è come il tuo coltellino svizzero per la piattaforma Disroot, realizzata dalla community per la community. Se non disponi di un account Disroot, puoi comunque utilizzare questa app per accedere a tutti i servizi Disroot che non richiedono un account, come ad esempio upload.

View file

@ -0,0 +1,16 @@
---
title: 'Disroot App'
bgcolor: '#1F5C60'
fontcolor: '#fff'
text_align: left
wider_column: right
---
<br>
## Скачайте в [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/ru/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/ru/packages/org.disroot.disrootapp/?class=lighter)
---
## Disroot app
Это приложение вроде швейцарского ножа для платформы **Disroot**, созданной сообществом для сообщества. Если у вас нет учетной записи **Disroot**, вы все равно можете использовать это приложение для доступа ко всем сервисам **Disroot**, для которых не требуется учетная запись, таким как быстрые заметки, файлообменник и т.д.

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -1,11 +1,11 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular
---
<br>
<a class="button button2" href="https://disroot.org/de/donate">Unterstütze uns</a>
<a class="button button2" href="https://disroot.org/de/donate">UNTERSTÜTZE UNS</a>

View file

@ -1,7 +1,7 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular

View file

@ -1,7 +1,7 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular

View file

@ -1,7 +1,7 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular

View file

@ -1,7 +1,7 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular

View file

@ -1,11 +1,11 @@
---
title: Donate button
bgcolor: '#f2f2f2'
fontcolor: '#FFF'
bgcolor: '#fff'
text_align: center
padding: 20px
body_classes: modular
---
<br>
<a class="button button2" href="https://disroot.org/en/donate">SUPPORT US</a>
<a class="button button2" href="https://disroot.org/en/donate">ПОДДЕРЖАТЬ НАС</a>

View file

@ -1,29 +0,0 @@
---
title: Online-Spende
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot ist angewiesen auf Spenden und Unterstützung seiner Community und der Nutzer der Services. Wenn Du gerne das Projekt am Leben erhalten und dabei helfen möchtest, Platz für potentielle neue Disrooter zu schaffen, nutze bitte eine der verfügbaren Möglichkeiten, um uns eine finanzielle Unterstützung zukommen zu lassen.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Spenden via Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Ein Patron werden" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter das!" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=de&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Kryptowährung" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Banküberweisung:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -1,29 +0,0 @@
---
title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -1,29 +0,0 @@
---
title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot depende de las donaciones y el apoyo de su comunidad y lxs usuarixs de los servicios. Si quieres que el proyecto siga funcionando y ayudar a crear espacio para potenciales nuevxs disrooters, por favor, utiliza alguno de los métodos disponibles para hacer una contribución económica.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donar utilizando Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Conviértete en Mecenas" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptomoneda" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -1,29 +0,0 @@
---
title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot compte sur les dons et le soutien de sa communauté et des utilisateurs de services. Si vous souhaitez que le projet se poursuive et aider à créer de l'espace pour de potentiels nouveaux Disrooters, veuillez utiliser l'une des méthodes disponibles pour faire une contribution financière.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Contribuer en utilisant Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Devenez un mécène" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=fr&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Virement bancaire:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -1,29 +0,0 @@
---
title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot si basa su donazioni e supporto da parte della sua comunità. Se desideri che il progetto continui a vivere e vuoi contribuire ad aumentare lo spazio disponibile per potenziali nuovi disrooter, utilizza uno dei seguenti metodi per fornire un contributo finanziario.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Dona utilizzando Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Diventa un Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -1,29 +0,0 @@
---
title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,31 @@
---
title: Online-Spende
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** ist angewiesen auf Spenden und Unterstützung seiner Community und der Nutzer der angebotenen Dienste. Wenn Du gerne das Projekt am Leben erhalten und dabei helfen möchtest, Platz für potentielle neue Disrooter zu schaffen, nutze bitte eine der verfügbaren Möglichkeiten, um einen finanziellen Beitrag zu leisten. Die [Domain-Verknüpfung](/services/email#alias) ist verfügbar für regelmäßige Unterstützer.
Du kannst uns auch unterstützen, indem Du [zusätzlichen E&#8209;Mailspeicher](/services/email#storage) und/oder [zusätzlichen Cloudspeicher](/services/nextcloud#storage) kaufst.
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Spenden via Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Ein Patron werden" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=de&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Kryptowährung" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Banküberweisung:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,31 @@
---
title: Online-donation
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Domain linking](/services/email#alias) is available for regular supporters.
You can also collaborate by buying [extra email storage](/services/email#storage) space and/or [extra cloud storage](/services/nextcloud#storage) space.
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,31 @@
---
title: Online-donation
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** depende de las donaciones y apoyo de su comunidad y personas usuarias de los servicios. Si quieres ayudar a que el proyecto avance y haya más espacio para potenciales nuevos y nuevas disrooters, por favor, utiliza cualquiera de los métodos habilitados para realizar una contribución económica. [Vinculación de dominios](/services/email#alias) está disponible para donantes habituales.
También puedes colaborar comprando [espacio de almacenamiento extra para el correo](/services/email#storage) y/o [espacio de almacenamiento extra para la nube](/services/nextcloud#storage).
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donar utilizando Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Conviértete en Mecenas" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptomoneda" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Transferencia bancaria:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,31 @@
---
title: Online-donation
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** compte sur les dons et le soutien de sa communauté et des utilisateurs de ses services. Si vous souhaitez que le projet se poursuive et contribuer à créer un environnement favorable à de nouveaux disrooters potentiels, veuillez utiliser l'une des méthodes disponibles pour apporter une contribution financière. Un lien vers un [domaine personnalisé](/services/email#alias) est disponible pour les donateurs réguliers.
Vous pouvez également collaborer en achetant de l'espace [stockage supplémentaire de courrier électronique](/services/email#storage) et/ou du [stockage cloud supplémentaire](/services/nextcloud#storage).
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Contribuer en utilisant Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Devenez un mécène" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=fr&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Virement bancaire:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,31 @@
---
title: Online-donation
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** si basa sulle donazioni e sul sostegno della sua comunità e degli utenti dei servizi. Se desideri mantenere attivo il progetto e contribuire a creare spazio per potenziali nuovi disrooter, utilizza uno dei metodi disponibili per fornire un contributo finanziario. [Alias e domini personalizzati](/services/email#alias) è disponibile per donatori regolari.
Puoi anche contribuire acquistando [spazio aggiuntivo per l'email](/services/email#storage) oppure [spazio aggiuntivo per il cloud](/services/nextcloud#storage).
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Dona utilizzando Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Diventa un Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Coordinate bancarie:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

View file

@ -0,0 +1,32 @@
---
title: Online-donation
bgcolor: '#fff'
wider_column: left
fontcolor: '#1e5a5e'
---
![](premium.png?class=reward) **Disroot** полагается на пожертвования и поддержку сообщества. Если вы хотите, чтобы проект продолжал существование и развитие, помогая новым пользователям находить уголок цифровой свободы, пожалуйста, используйте любой из доступных методов доната для внесения материального вклада в наше дело.
Для людей, которые регулярно поддерживают нас, возможна [привязка доменов](/services/email#alias).
Вы также можете поддержать нас, [расширив почтовое хранилище](/services/email#storage) и/или [увеличив дисковое пространство](/services/nextcloud#storage) вашего облачного хранилища.
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>
<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
</div>
<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Банковский перевод:</span>
<span style="color:#4e1e2d; font-size:1.1em;">
Stichting Disroot.org
IBAN NL19 TRIO 0338 7622 05
BIC TRIONL2U
</span>

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

View file

@ -7,11 +7,11 @@ fontcolor: '#555'
text_align: left
services:
-
title: Email
title: E-Mail
icon: email.png
link: 'https://disroot.org/services/email'
text: "Freie und sichere Email-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
button: 'https://mail.disroot.org'
text: "Freie und sichere E&#8209;Mail-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
button: 'https://webmail.disroot.org'
buttontext: "Anmelden"
-
title: Cloud
@ -20,13 +20,6 @@ services:
text: "Deine Daten unter Deiner Kontrolle! Sichern, Synchronisieren, Teilen von Kalendern, Kontakten und mehr."
button: 'https://cloud.disroot.org'
buttontext: "Anmelden"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Diskussionsforen / Mailinglisten für Deine Projekte, Gruppen oder Gemeinschaften."
button: 'https://forum.disroot.org'
buttontext: "Anmelden"
-
title: XMPP-Chat
icon: xmpp.png
@ -41,13 +34,7 @@ services:
text: "Gemeinschaftlich und in Echtzeit Dokumente direkt im Webbrowser bearbeiten"
button: 'https://pad.disroot.org'
buttontext: "Ein Pad starten"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Gemeinschaftlich und in Echtzeit Tabellen direkt im Webbrowser bearbeiten"
button: 'https://calc.disroot.org'
buttontext: "Ein Calc starten"
-
title: 'Paste-Bin'
icon: pastebin.png
@ -69,20 +56,7 @@ services:
text: "Eine anonyme Meta-Suchmaschine."
button: 'https://search.disroot.org'
buttontext: "Suche"
-
title: Umfragen
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Onlinedienst zur Abstimmung von Terminen oder um schnell eine gemeinsame Entscheidung zu treffen."
button: 'https://poll.disroot.org'
buttontext: "Umfrage starten"
-
title: Projekt-Board
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "Ein Werkzeug zur Projektverwaltung im Kanban-Stil."
button: 'https://board.disroot.org'
buttontext: "Anmelden"
-
title: 'Calls'
icon: calls.png
@ -90,4 +64,50 @@ services:
text: "Ein Werkzeug für Videokonferenzen."
button: 'https://calls.disroot.org'
buttontext: "Aufruf"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Eine Code-Hosting- und -Projektzusammenarbeits-Plattform."
button: 'https://git.disroot.org'
buttontext: "Anmelden"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Eine Voice-Chat-Anwendung mit niedriger Latenz und hoher Sprachqualität."
button: 'https://disroot.org/services/audio'
buttontext: "Info"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Eine schon vom Design her vertraulich gestaltete Alternative zu gängigen Office-Tools."
button: 'https://cryptpad.disroot.org'
buttontext: "Zugang"
#badge: EXPERIMENTAL
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "Ein Microblogging-Tool, das mit anderen Servern, die ActivityPub unterstützen, föderiert."
button: 'https://fe.disroot.org'
buttontext: "Anmelden"
-
title: 'Translate'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "Ein Übersetzungs-Tool."
button: 'https://translate.disroot.org'
buttontext: "Zugang"
-
title: 'D·Scribe'
icon: scribe.png
link: 'https://disroot.org/services/scribe'
text: "Eine Plattform zur Sammeln von Links und zur Diskussion, die mit anderen Servern, die ActivityPub unterstützen föderieren kann"
button: 'https://scribe.disroot.org'
buttontext: "Zugang"
---

View file

@ -11,7 +11,7 @@ services:
icon: email.png
link: 'https://disroot.org/services/email'
text: "Free and secure email accounts for your desktop IMAP client or via a Web-interface."
button: 'https://mail.disroot.org'
button: 'https://webmail.disroot.org'
buttontext: "Log in"
-
title: Cloud
@ -20,13 +20,6 @@ services:
text: "Your data under your control! Collaborate, sync & share files, calendars, contacts and more."
button: 'https://cloud.disroot.org'
buttontext: "Log in"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Discussion forums / mailing-list for your community, group or collective."
button: 'https://forum.disroot.org'
buttontext: "Log in"
-
title: XMPP Chat
icon: xmpp.png
@ -35,19 +28,13 @@ services:
button: 'https://webchat.disroot.org'
buttontext: "Log in"
-
title: Pads
title: Pad
icon: pads.png
link: 'https://disroot.org/services/pads'
text: "Create and edit documents collaboratively in real-time directly in the web browser."
button: 'https://pad.disroot.org'
buttontext: "Start a pad"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Create and edit spreadsheets collaboratively in real-time directly in the web browser."
button: 'https://calc.disroot.org'
buttontext: "Start a calc"
-
title: 'Paste Bin'
icon: pastebin.png
@ -69,20 +56,7 @@ services:
text: "An anonymous multi search engine platform."
button: 'https://search.disroot.org'
buttontext: "Search"
-
title: Polls
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'https://poll.disroot.org'
buttontext: "Start a poll"
-
title: 'Project Board'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "A project management tool."
button: 'https://board.disroot.org'
buttontext: "Log in"
-
title: 'Calls'
icon: calls.png
@ -90,4 +64,51 @@ services:
text: "A videoconferencing tool."
button: 'https://calls.disroot.org'
buttontext: "Start a call"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "A code hosting and project collaboration."
button: 'https://git.disroot.org'
buttontext: "Log in"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "A low latency, high quality voice chat application."
button: 'https://disroot.org/services/audio'
buttontext: "Info"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "A private-by-design alternative to popular office tools."
button: 'https://cryptpad.disroot.org'
buttontext: "Access"
#badge: EXPERIMENTAL
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "A microblogging tool that can federate with other servers that support ActivityPub."
button: 'https://fe.disroot.org'
buttontext: "Log in"
-
title: 'Translate'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "A translation application."
button: 'https://translate.disroot.org'
buttontext: "Access"
-
title: 'D·Scribe'
icon: scribe.png
link: 'https://disroot.org/services/scribe'
text: "A link aggregation and discussion platform that can federate with other servers that support ActivityPub."
button: 'https://scribe.disroot.org'
buttontext: "Access"
---

View file

@ -10,84 +10,103 @@ services:
title: Correo
icon: email.png
link: 'https://disroot.org/services/email'
text: "Cuentas de correo seguras y gratuitas para tu cliente IMAP de escritorio o via la interfaz web."
button: 'https://mail.disroot.org'
buttontext: "Accede"
text: "Cuentas de correo seguras y gratuitas para tu cliente IMAP de escritorio o via web."
button: 'https://webmail.disroot.org'
buttontext: "Acceder"
-
title: Nube
icon: cloud.png
link: 'https://disroot.org/services/nextcloud/'
text: "¡Tus datos bajo tu control! Colabora, sincroniza y comparte archivos, calendarios, contactos y más."
button: 'https://cloud.disroot.org'
buttontext: "Accede"
-
title: Foro
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Foros de discusión / lista de correo para tu comunidad, grupo o colectivo."
button: 'https://forum.disroot.org'
buttontext: "Accede"
buttontext: "Acceder"
-
title: Chat XMPP
icon: xmpp.png
link: 'https://disroot.org/services/xmpp'
text: "Mensajería instantánea descentralizada."
button: 'https://webchat.disroot.org'
buttontext: "Accede"
buttontext: "Acceder"
-
title: Blocs
icon: pads.png
link: 'https://disroot.org/services/pads'
text: "Crea y edita documentos colaborativamente y en tiempo real directamente en tu navegador web."
text: "Crea y edita documentos colaborativamente y en tiempo real directamente en tu navegador."
button: 'https://pad.disroot.org'
buttontext: "Abre un bloc"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Crea y edita planillas colaborativamente y en tiempo real directamente en tu navegador web."
button: 'https://calc.disroot.org'
buttontext: "Abre un calc"
buttontext: "Abrir un bloc"
-
title: 'Paste Bin'
icon: pastebin.png
link: 'https://disroot.org/services/privatebin'
text: "Paste-bin/tablero de discusión cifrado en línea."
button: 'https://bin.disroot.org'
buttontext: "Comparte un pastebin"
buttontext: "Compartir un pastebin"
-
title: Subida
icon: upload.png
link: 'https://disroot.org/services/upload'
text: "Software de alojamiento temporario cifrado."
text: "Alojamiento temporario cifrado."
button: 'https://upload.disroot.org'
buttontext: "Comparte un archivo"
buttontext: "Compartir un archivo"
-
title: Búsqueda
icon: search.png
link: 'https://disroot.org/services/search'
text: "Plataforma de búsqueda anónima multimotor."
text: "Plataforma multimotor de búsqueda anónima."
button: 'https://search.disroot.org'
buttontext: "Buscar"
-
title: Encuestas
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Servicio en línea para planificar reuniones o tomar decisiones en forma rápida y sencilla."
button: 'https://poll.disroot.org'
buttontext: "Comienza una encuesta"
-
title: 'Tablero de proyecto'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "Una herramienta de gestión de proyectos."
button: 'https://board.disroot.org'
buttontext: "Accede"
-
title: 'Calls'
title: 'Llamadas'
icon: calls.png
link: 'https://disroot.org/services/calls'
text: "Una herramienta de videoconferencia."
text: "Herramienta de videoconferencia."
button: 'https://calls.disroot.org'
buttontext: "Llamada"
buttontext: "Llamar"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Hospedaje de código y proyectos colaborativos."
button: 'https://git.disroot.org'
buttontext: "Acceder"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Herramienta de audio chat."
button: 'https://disroot.org/services/audio'
buttontext: "Hablar"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Herramientas ofimáticas privadas-por-defecto."
button: 'https://cryptpad.disroot.org'
buttontext: "Acceder"
#badge: EXPERIMENTAL
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "Herramienta de microblogging que puede federar con otros servidores que soporten ActivityPub."
button: 'https://fe.disroot.org'
buttontext: "Iniciar sesión"
-
title: 'Traductor'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "Aplicación en línea para traducir."
button: 'https://translate.disroot.org'
buttontext: "Traducir"
-
title: 'D·Scribe'
icon: scribe.png
link: 'https://disroot.org/services/scribe'
text: "Agregador de links y plataforma de discusión que puede federar con otros servidores que soporten ActivityPub."
button: 'https://scribe.disroot.org'
buttontext: "Acceder"
---

View file

@ -11,7 +11,7 @@ services:
icon: email.png
link: 'https://disroot.org/services/email'
text: "Comptes de messagerie gratuits et sécurisés pour votre client IMAP de bureau ou via une interface Web."
button: 'https://mail.disroot.org'
button: 'https://webmail.disroot.org'
buttontext: "Se connecter"
-
title: Cloud
@ -20,13 +20,7 @@ services:
text: "Vos données sous votre contrôle ! Collaborez, synchronisez et partagez des fichiers, des calendriers, etc."
button: 'https://cloud.disroot.org'
buttontext: "Se connecter"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Forums de discussion / mailing-list pour votre communauté, groupe ou collectif."
button: 'https://forum.disroot.org'
buttontext: "Se connecter"
-
title: Chat XMPP
icon: xmpp.png
@ -41,13 +35,7 @@ services:
text: "Créez et modifiez des documents en collaboration et en temps réel."
button: 'https://pad.disroot.org'
buttontext: "Commencer"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Créez et modifiez des feuilles de calcul en collaboration et en temps réel."
button: 'https://calc.disroot.org'
buttontext: "Commencer"
-
title: 'Paste Bin'
icon: pastebin.png
@ -69,20 +57,7 @@ services:
text: "Une plate-forme anonyme multi moteurs de recherche."
button: 'https://search.disroot.org'
buttontext: "Rechercher"
-
title: Polls
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Service en ligne pour planifier un rendez-vous ou prendre des décisions rapidement et facilement."
button: 'https://poll.disroot.org'
buttontext: "Sonder"
-
title: 'Project Board'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "Un outil de gestion de projet."
button: 'https://board.disroot.org'
buttontext: "Se connecter"
-
title: 'Calls'
icon: calls.png
@ -90,4 +65,50 @@ services:
text: "Un outil de vidéo conférence."
button: 'https://calls.disroot.org'
buttontext: "Appeler"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Un hébergement de code et une collaboration de projet."
button: 'https://git.disroot.org'
buttontext: "Se connecter"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Une application de chat vocal à faible latence et de haute qualité."
button: 'https://disroot.org/services/audio'
buttontext: "Info"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Une alternative privée aux outils de bureautique populaires."
button: 'https://cryptpad.disroot.org'
buttontext: "Accès"
#badge:
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "Un outil de microblogging qui peut fédérer avec d'autres serveurs qui supportent ActivityPub."
button: 'https://fe.disroot.org'
buttontext: "Se connecter"
-
title: 'Translate'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "Une application de traduction."
button: 'https://translate.disroot.org'
buttontext: "Accès"
-
title: 'D·Scribe'
icon: scribe.png
link: 'https://disroot.org/services/scribe'
text: "Une plateforme d'agrégation de liens et de discussion qui peut se fédérer avec d'autres serveurs qui supportent ActivityPub."
button: 'https://scribe.disroot.org'
buttontext: "Accès"
---

View file

@ -11,7 +11,7 @@ services:
icon: email.png
link: 'https://disroot.org/services/email'
text: "Account di posta libero e sicuro accessibile attraverso client o interfaccia web."
button: 'https://mail.disroot.org'
button: 'https://webmail.disroot.org'
buttontext: "Accedi"
-
title: Cloud
@ -20,13 +20,6 @@ services:
text: "I tuoi dati sotto il tuo controllo. Collabora, sincronizza e condividi file, calendari e contatti."
button: 'https://cloud.disroot.org'
buttontext: "Accedi"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Forum di discussione/mailing list per la tua comunità, gruppo o collettivo."
button: 'https://forum.disroot.org'
buttontext: "Accedi"
-
title: XMPP Chat
icon: xmpp.png
@ -41,13 +34,7 @@ services:
text: "Crea e modifica documenti direttamente nel browser web."
button: 'https://pad.disroot.org'
buttontext: "Iniziare"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Crea e modifica fogli di calcolo direttamente nel browser web."
button: 'https://calc.disroot.org'
buttontext: "Iniziare"
-
title: 'Paste Bin'
icon: pastebin.png
@ -59,7 +46,7 @@ services:
title: Upload
icon: upload.png
link: 'https://disroot.org/services/upload'
text: "Encrypted, temporary file hosting and sharing software."
text: "Software di condivisione per file temporanei crittografato ."
button: 'https://upload.disroot.org'
buttontext: "Condividere"
-
@ -69,20 +56,7 @@ services:
text: "Un metamotore di ricerca anonimo."
button: 'https://search.disroot.org'
buttontext: "Ricerca"
-
title: Polls
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Servizio online per pianificare appuntamenti e prendere decisioni in modo veloce e facile."
button: 'https://poll.disroot.org'
buttontext: "Iniziare"
-
title: 'Project Board'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "Uno strumento di project management."
button: 'https://board.disroot.org'
buttontext: "Accedi"
-
title: 'Calls'
icon: calls.png
@ -90,4 +64,51 @@ services:
text: "Uno strumento di videoconferenza."
button: 'https://calls.disroot.org'
buttontext: "Chiamare"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Un hosting per codice e gestione di progetti."
button: 'https://git.disroot.org'
buttontext: "Entra"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Un'applicazione di chat vocale a bassa latenza e di alta qualità."
button: 'https://mumble.disroot.org'
buttontext: "Entra"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Un'alternativa personalizzata ai popolari strumenti di ufficio."
button: 'https://disroot.org/services/audio'
buttontext: "Info"
#badge: EXPERIMENTAL
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "Uno strumento di microblogging che può federarsi con altri server che supportano ActivityPub."
button: 'https://fe.disroot.org'
buttontext: "Entra"
-
title: 'Translate'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "Una applicazione di traduzione."
button: 'https://translate.disroot.org'
buttontext: "Accesso"
-
title: 'D·Scribe'
icon: scribe.png
link: 'https://disroot.org/services/scribe'
text: "Piattaforma di aggregazione e discussione di link che può federarsi con altri server che supportano ActivityPub."
button: 'https://scribe.disroot.org'
buttontext: "Entra"
---

View file

@ -7,87 +7,99 @@ fontcolor: '#555'
text_align: left
services:
-
title: Email
title: 'Почта'
icon: email.png
link: 'https://disroot.org/services/email'
text: "Free and secure email accounts for your desktop IMAP client or via a Web-interface."
button: 'https://mail.disroot.org'
buttontext: "Log in"
text: "Бесплатный и безопасный почтовый сервер с поддержкой IMAP и приятным веб-интерфейсом."
button: 'https://webmail.disroot.org'
buttontext: "Войти"
-
title: Cloud
title: 'Облако'
icon: cloud.png
link: 'https://disroot.org/services/nextcloud/'
text: "Your data under your control! Collaborate, sync & share files, calendars, contacts and more."
text: "Ваши данные под вашим контролем! Совместная работа, синхронизация, обмен файлами и многое другое."
button: 'https://cloud.disroot.org'
buttontext: "Log in"
buttontext: "Войти"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Discussion forums / mailing-list for your community, group or collective."
button: 'https://forum.disroot.org'
buttontext: "Log in"
-
title: XMPP Chat
title: 'XMPP чат'
icon: xmpp.png
link: 'https://disroot.org/services/xmpp'
text: "Decentralized instant messaging."
text: "Децентрализованный мессенджер, проверенный временем."
button: 'https://webchat.disroot.org'
buttontext: "Log in"
buttontext: "Войти"
-
title: Pads
title: 'Документы'
icon: pads.png
link: 'https://disroot.org/services/pads'
text: "Create and edit documents collaboratively in real-time directly in the web browser."
text: "Совместно создавайте и редактируйте документы прямо в браузере."
button: 'https://pad.disroot.org'
buttontext: "Start a pad"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Create and edit spreadsheets collaboratively in real-time directly in the web browser."
button: 'https://calc.disroot.org'
buttontext: "Start a calc"
buttontext: "Создать документ"
-
title: 'Paste Bin'
icon: pastebin.png
link: 'https://disroot.org/services/privatebin'
text: "Encrypted online paste-bin/discussion board."
text: "Зашифрованные онлайн заметки и обсуждения."
button: 'https://bin.disroot.org'
buttontext: "Share a pastebin"
buttontext: "Поделиться заметкой"
-
title: Upload
title: 'Файлообменник'
icon: upload.png
link: 'https://disroot.org/services/upload'
text: "Encrypted, temporary file hosting and sharing software."
text: "Зашифрованное файловое хранилище с ограниченным сроком хранения."
button: 'https://upload.disroot.org'
buttontext: "Share a file"
buttontext: "Поделиться файлом"
-
title: Search
title: 'SearX'
icon: search.png
link: 'https://disroot.org/services/search'
text: "An anonymous multi search engine platform."
text: "Гибкий приватный инструмент для поиска в интернете."
button: 'https://search.disroot.org'
buttontext: "Search"
buttontext: "Найти"
-
title: Polls
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'http://polls.disroot.org'
buttontext: "Start a poll"
-
title: 'Project Board'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "A project management tool."
button: 'https://board.disroot.org'
buttontext: "Log in"
-
title: 'Calls'
title: 'Jitsi'
icon: calls.png
link: 'https://disroot.org/services/calls'
text: "A videoconferencing tool."
text: "Сервис для проведения видеозвонков."
button: 'https://calls.disroot.org'
buttontext: "Start a call"
buttontext: "Начать конференцию"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Площадка для хостинга исходных текстов и совместной разработки."
button: 'https://git.disroot.org'
buttontext: "Войти"
-
title: 'Mumble'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Голосовой чат с низкой задержкой и хорошим качеством звука."
button: 'https://disroot.org/services/audio'
buttontext: "Инфо"
#badge: EXPERIMENTAL
-
title: 'CryptPad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Альтернатива популярным офисным приложениям с акцентом на приватность."
button: 'https://cryptpad.disroot.org'
buttontext: "Начать"
#badge: EXPERIMENTAL
-
title: 'Akkoma'
icon: akkoma.png
link: 'https://disroot.org/services/akkoma'
text: "A microblogging tool that can federate with other servers that support ActivityPub."
button: 'https://fe.disroot.org'
buttontext: "Log in"
-
title: 'Translate'
icon: translate.png
link: 'https://disroot.org/services/libretranslate'
text: "Онлайн переводчик."
button: 'https://translate.disroot.org'
buttontext: "Начать"
---

View file

@ -8,4 +8,4 @@ body_classes: modular
---
<br>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">Registrieren</a>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">REGISTRIEREN</a>

View file

@ -8,4 +8,4 @@ body_classes: modular
---
<br>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">REGISTRATI</a>

View file

@ -8,4 +8,4 @@ body_classes: modular
---
<br>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>
<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">ЗАРЕГИСТРИРОВАТЬСЯ</a>

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,16 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
translation_banner:
set: true
last_modified: März 2022
language: German
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="de/blog.atom" />

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,10 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="en/blog.atom" />

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,15 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
translation_banner:
set: true
last_modified: Enero · 2024
language: Spanish
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="es/blog.atom" />

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,15 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
translation_banner:
set: true
last_modified: Mars 2022
language: French
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="fr/blog.atom" />

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,15 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
translation_banner:
set: true
last_modified: Marzo 2022
language: Italian
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="it/blog.atom" />

View file

@ -1,6 +1,6 @@
---
title: Disroot
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -12,7 +12,15 @@ content:
- _donation
- _signup
- _services
- _disapp
menu: home
big_header: true
onpage_menu: true
translation_banner:
set: true
last_modified: Март 2022
language: Russian
---
<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="ru/blog.atom" />

View file

@ -1,21 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="/mission-statement">Unser Leitbild</a>
---
**Disroot** ist ein in Amsterdam ansässiges Projekt, welches durch Freiwillige unterhalten wird und auf die Unterstützung seiner Gemeinschaft angewiesen ist.
Ursprünglich haben wir **Disroot** aufgrund unseres persönlichen Bedarfs erschaffen. Wir waren auf der Suche nach einer Software, mit der wir innerhalb unseres Umfelds kommunizieren, teilen und organisieren konnten. Den meisten verfügbaren Lösungen fehlten die grundlegenden Prinzipien, die uns wichtig sind; Unsere Programme sollen **offen**, **dezentralisiert** und **föderalistisch** sein und **Freiheit** und **Datenschutz** absolut **respektieren**.
Während wir nach solchen Programmen gesucht haben, fanden wir einige wirklich interessante Projekte. Projekte von denen wir denken, dass sie jedem zur Verfügung stehen sollten, der die gleichen Prinzipien wertschätzt wie wir. Deswegen haben wir beschlossen, einige Programme zu bündeln und sie mit Anderen zu teilen. **Disroot** war geboren.
Durch **Disroot** hoffen wir, die Art, wie Menschen sich alltäglich im Internet begegnen, grundlegend zu ändern. Wir wollen die Menschen ermutigen, aus den goldenen Käfigen der etablierten Software **auszubrechen** und sich offenen und ethischen Alternativen zuzuwenden. Egal, ob auf unserer Plattform oder einer anderen (oder Du bietest sogar irgendwann selbst eine an).
Zusammen können wir ein Netzwerk erschaffen, dass wirklich unabhängig ist, ausgerichtet auf den Vorteil der Menschen anstatt auf ihre Ausbeutung.

View file

@ -1,21 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="/mission-statement">Read our mission statement</a>
---
**Disroot** is a project based in Amsterdam which is maintained by volunteers and depends on the support of its community.
We originally created **Disroot** out of personal need, we were looking for software we could use to communicate, share and organize within our circles. Most of the available solutions were missing the key elements that we find important; Our tools should be **open**, **decentralized**, **federated** and **respectful** towards **freedom** and **privacy**.
While searching for such tools, we found some really interesting projects, projects that we believe should be available to anyone who values similar principals. We therefore decided to bundle some applications together and share them with others. This is how **Disroot** got started.
By running **Disroot** we hope to change how people typically interact on the web. We want to encourage people to **break free** of the walled gardens of popular software and turn to open and ethical alternatives, may it be on our platform or on another (or you could even host your own).
Together we can form a network that is truly independent, focused on the benefit of the people rather than the exploitation thereof.

View file

@ -1,21 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="https://disroot.org/es/mission-statement">Lee nuestra Declaración de Objetivos</a>
---
**Disroot** es un proyecto radicado en Amsterdam, mantenido por voluntarixs y que depende del apoyo de su comunidad.
Originalmente, creamos **Disroot** por necesidades personales. Buscábamos software que pudiéramos usar para comunicarnos, compartir y organizarnos dentro de nuestros círculos. La mayoría de las soluciones disponibles carecían de los elementos claves que nosotros consideramos importantes: nuestras herramientas debían ser **abiertas**, **descentralizadas**, **federadas** y **respetuosas** de la **libertad** y la **privacidad**.
Mientras buscábamos esas herramientas, encontramos algunos proyectos realmente interesantes, proyectos que creemos que deberían estar disponibles para cualquiera que valore principios similares. Por lo tanto, decidimos reunir algunas aplicaciones y compartirlas con otros. Así es cómo **Disroot** empezó.
Con el funcionamiento de **Disroot** esperamos cambiar la manera en que la gente habitualmente interactúa en la web. Queremos alentar a las personas a **liberarse** de los "[jardines vallados](https://es.wikipedia.org/wiki/Jard%C3%ADn_vallado_(inform%C3%A1tica)" del software popular y cambiar a alternativas abiertas y éticas, ya sea en nuestra plataforma o en otra (o incluso en la tuya propia).
Juntos podemos construir una red que sea verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.

View file

@ -1,21 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="/mission-statement">Lire notre Declaration de Mission</a>
---
**Disroot** est un projet basé à Amsterdam, il est géré par des bénévoles et dépend du soutien de sa communauté.
A l'origine, nous avons créé **Disroot** par besoin personnel, nous recherchions des logiciels que nous pouvions utiliser pour communiquer, partager et organiser au sein de nos cercles. La plupart des solutions disponibles manquaient les éléments clés que nous trouvons importants. Nos outils devraient être **ouverts**, **décentralisés**, **fédérés** et **respectueux** de la **liberté** et de la **vie privée**.
En cherchant de tels outils, nous avons trouvé des projets vraiment intéressants - des projets qui, à notre avis, devraient être accessibles à tous ceux qui valorisent des principes similaires. Nous avons donc décidé de regrouper certaines applications et de les partager avec d'autres. C'est ainsi que **Disroot** a commencé.
En lançant **Disroot**, nous espérons changer la façon dont les gens interagissent généralement sur le web. Nous voulons encourager les gens à **se libérer** des jardins murés des logiciels populaires et à se tourner vers des alternatives ouvertes et éthiques, que ce soit sur notre plateforme ou sur une autre (ou vous pourriez même héberger la vôtre).
Ensemble, nous pouvons former un réseau véritablement indépendant, centré sur le bénéfice des gens plutôt que sur leur exploitation.

View file

@ -1,24 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="/mission-statement">Leggi la nostra dichiarazione d'intenti</a>
---
**Disroot** è un progetto con sede ad Amsterdam, mantenuto da volontari e che dipende dal supporto della sua comunità.
Abbiamo originariamente creato **Disroot** per rispondere ai bisogni personali. Stavamo infatti cercando un software che ci permettesse di comunicare, condividere ed organizzarci al nostro interno.
La maggior parte delle soluzioni presenti avevano lacune per noi molto importanti: i nostri strumenti devono infatti essere **aperti**, **decentralizzati**, **federati** e rispettosi della **privacy** dell'utente.
Durante la ricerca di questi strumenti, abbiamo trovato dei progetti molto interessanti che credavamo dovessero essere accessibili a chiunque condividesse i nostri principi.
Abbiamo quindi deciso di unire e condividere alcune di queste applicazioni.
Così è come **Disroot** ha visto la sua nascita.
Grazie al progetto **Disroot** speriamo di cambiare il modo con coi le persone interagiscono sul Web. Vogliamo incoraggiare le persone ad utilizzare strumenti aperti e alternativi, sia sulla piattaforma Disroot sia su altre simili.
Assieme possiamo creare una rete indipendente che mette al centro le persone.

View file

@ -1,21 +0,0 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
---
<a class="button button1" href="/mission-statement">Прочтите наше заявление о целях</a>
---
**Disroot** - это поддерживаемый добровольцами проект основанный в Амстердаме, который зависит от помощи своего сообщества.
Первоначально мы создавали **Disroot** из-за своих надобностей, мы искали такое обеспечение, которое можно было бы использовать для общения и организации внутри наших кругов. Большей части из имеющихся решений недоставало ключевых элементов, которые мы считаем главными. Наши инструменты должны быть **открытыми**, **децентрализованными**, **объединёнными** и **уважающими** аспекты **свободы** и **конфиденциальности**.
В процессе поиска таких инструментов мы нашли несколько по-настоящему интересных проектов, которые, как мы считаем, должны быть доступны каждому, кто ценит похожие принципы. Поэтому мы решили собрать несколько приложений вместе и делиться ими с другими. Вот как **Disroot** начался.
Заставляя **Disroot** работать, мы надеемся изменить типичное представление людей о взаимодействии с интернетом. Мы хотим воодушевить людей **прорваться на свободу** из огороженных садов популярных программ и повернуть их в сторону нравственных альтернатив; где бы это не произошло - на нашей платформе или на другой (или даже вы запустите свою).
Вместе мы можем сформировать сеть, которая в самом деле независима, лучше нацелена на благо людей, а не на их эксплуатацию.

View file

@ -0,0 +1,22 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Unser Leitbild</a>
---
**Disroot** ist ein in Amsterdam ansässiges Projekt, welches durch Freiwillige unterhalten wird und auf die Unterstützung seiner Gemeinschaft angewiesen ist.
Ursprünglich haben wir **Disroot** aufgrund unseres persönlichen Bedarfs erschaffen. Wir waren auf der Suche nach einer Software, mit der wir innerhalb unseres Umfelds kommunizieren, teilen und organisieren konnten. Den meisten verfügbaren Lösungen fehlten die grundlegenden Prinzipien, die uns wichtig sind; unsere Programme sollten **offen**, **dezentralisiert** und **föderalistisch** sein und **Freiheit** und **Datenschutz** absolut **respektieren**.
Während wir nach solchen Programmen gesucht haben, fanden wir einige wirklich interessante Projekte. Projekte von denen wir denken, dass sie jedem zur Verfügung stehen sollten, der die gleichen Prinzipien wertschätzt wie wir. Deswegen haben wir beschlossen, einige Programme zu bündeln und sie mit Anderen zu teilen. **Disroot** war geboren.
Durch **Disroot** hoffen wir, die Art, wie Menschen sich alltäglich im Internet begegnen, grundlegend zu ändern. Wir wollen die Menschen ermutigen, aus den "Walled Gardens", den geschlossenen Systemen der etablierten Software **auszubrechen** und sich offenen und ethischen Alternativen zuzuwenden. Egal, ob auf unserer Plattform oder einer anderen (oder Du bietest vielleicht sogar irgendwann selbst eine an).
Zusammen können wir ein Netzwerk erschaffen, dass wirklich unabhängig ist, ausgerichtet auf den Vorteil der Menschen anstatt auf ihre Ausbeutung.

View file

@ -0,0 +1,22 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Read our mission statement</a>
---
**Disroot** is a project that was born from the personal need to communicate, share and organize ourselves within our circles through tools that met a series of fundamental criteria for us: they had to be **open**, **decentralized**, **federated** and above all **respectful** towards **freedom** and **privacy**. None of the most popular solutions complied with them, but in our search we found some very interesting projects that did. And since we thought that they should be available to all those with similar ethical principles, we decided not only to group these applications and share them with others, but also to manage them according to those values. That's how **Disroot** started.
The project is based in Amsterdam, was founded by **Muppeth** and **Antilopa** in 2015, it is maintained by volunteers and relies on the support of its community. Between 2017 and 2018, a group of members started to get very actively involved and to collaborate very closely. In 2019, two of them, **Fede** and **Meaz**, officially became part of the Core Team that manages the platform. Two years later, in 2021, **Avg_Joe** joined the tasks and responsibilities.
**Disroot** aims to change the way people are used to interact on the web. We want to encourage and show them not only that there are open and ethical alternatives but also that it is the only possible way to break free from the *walled gardens* proposed and promoted by proprietary software and corporations, either through our platform, others that have similar values and goals or even their own projects.
We are convinced that we can build together a truly independent network, focused on the benefit of the people and not on their exploitation.

View file

@ -0,0 +1,22 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Lee nuestra Declaración de Objetivos</a>
---
**Disroot** es un proyecto que nació de la necesidad personal de comunicarnos, compartir y organizarnos dentro de nuestros círculos a través de herramientas que se ajustaran a una serie de criterios fundamentales para nosotros: tenían que ser **abiertas**, **descentralizadas**, **federadas** y sobre todo **respetuosas** de la **libertad** y la **privacidad**. Ninguna de las soluciones más populares cumplían con ellos, pero en nuestra búsqueda encontramos algunos proyectos muy interesantes que sí lo hacían. Y como pensamos que debían estar al alcance de todas aquellas personas con principios éticos similares, decidimos no solo agrupar estas aplicaciones y compartirlas con otres, sino también gestionarlas de acuerdo con esos valores. Así es como **Disroot** comenzó.
El proyecto está radicado en Amsterdam, fue fundado por **Muppeth** y **Antilopa** en 2015, es mantenido por personas voluntarias y depende del apoyo de su comunidad. Entre 2017 y 2018, un grupo de miembros comenzaron a involucrarse muy activamente y a colaborar de manera muy estrecha. En 2019, dos de ellos, **Fede** y **Meaz**, pasaron oficialmente a formar parte del Equipo Principal que administra la plataforma. Dos años más tarde, en 2021, **Avg_Joe** se sumó a las tareas y responsabilidades.
**Disroot** pretende cambiar la manera en que las personas están acostumbradas a interactuar en la web. Queremos alentarlas y mostrarles no solo que existen alternativas abiertas y éticas sino también que es el único camino posible para liberarse de los *jardines vallados* que proponen y promueven el software propietario y las corporaciones, ya sea a través de nuestra plataforma, de otras que tienen valores y objetivos similares o incluso de sus propios proyectos.
Estamos convencidos que podemos construir, todas y todos juntos, una red verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.

View file

@ -0,0 +1,22 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Lire notre Declaration de Mission</a>
---
**Disroot** est un projet basé à Amsterdam, il est géré par des bénévoles et dépend du soutien de sa communauté.
A l'origine, nous avons créé **Disroot** par besoin personnel, nous recherchions des logiciels que nous pouvions utiliser pour communiquer, partager et organiser au sein de nos cercles. La plupart des solutions disponibles manquaient les éléments clés que nous trouvons importants. Nos outils devraient être **ouverts**, **décentralisés**, **fédérés** et **respectueux** de la **liberté** et de la **vie privée**.
En cherchant de tels outils, nous avons trouvé des projets vraiment intéressants - des projets qui, à notre avis, devraient être accessibles à tous ceux qui valorisent des principes similaires. Nous avons donc décidé de regrouper certaines applications et de les partager avec d'autres. C'est ainsi que **Disroot** a commencé.
En lançant **Disroot**, nous espérons changer la façon dont les gens interagissent généralement sur le web. Nous voulons encourager les gens à **se libérer** des jardins murés des logiciels populaires et à se tourner vers des alternatives ouvertes et éthiques, que ce soit sur notre plateforme ou sur une autre (ou vous pourriez même héberger la vôtre).
Ensemble, nous pouvons former un réseau véritablement indépendant, centré sur le bénéfice des gens plutôt que sur leur exploitation.

View file

@ -0,0 +1,25 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Leggi la nostra dichiarazione d'intenti</a>
---
**Disroot** è un progetto con sede ad Amsterdam, mantenuto da volontari e che dipende dal supporto della sua comunità.
Abbiamo originariamente creato **Disroot** per rispondere ai bisogni personali. Stavamo infatti cercando un software che ci permettesse di comunicare, condividere ed organizzarci al nostro interno.
La maggior parte delle soluzioni presenti avevano lacune per noi molto importanti: i nostri strumenti devono infatti essere **aperti**, **decentralizzati**, **federati** e rispettosi della **privacy** dell'utente.
Durante la ricerca di questi strumenti, abbiamo trovato dei progetti molto interessanti che credavamo dovessero essere accessibili a chiunque condividesse i nostri principi.
Abbiamo quindi deciso di unire e condividere alcune di queste applicazioni.
Così è come **Disroot** ha visto la sua nascita.
Grazie al progetto **Disroot** speriamo di cambiare il modo con coi le persone interagiscono sul Web. Vogliamo incoraggiare le persone ad utilizzare strumenti aperti e alternativi, sia sulla piattaforma Disroot sia su altre simili.
Assieme possiamo creare una rete indipendente che mette al centro le persone.

View file

@ -0,0 +1,22 @@
---
title: Email
bgcolor: '#1F5C60'
fontcolor: '#FFFFFF'
body_classes: modular
wider_column: right
---
<a class="button button1" href="/mission-statement">Прочтите наше заявление о целях</a>
---
Проект **Disroot** создавался из личной потребности общаться и организовываться в своих кругах с помощью инструментов, которые отвечали бы ряду фундаментальных для нас критериев: они должны быть **открытыми**, **децентрализованными**, **федеративными** и, прежде всего, **уважительными** по отношению к **свободе** и **конфиденциальности**. Ни одно из наиболее популярных решений им не соответствовало, но в ходе поиска мы нашли несколько очень интересных проектов. И поскольку мы считали, что они должны быть доступны всем, кто придерживается подобных этических принципов, мы решили не только сгруппировать эти приложения и поделиться ими с другими, но и управлять ими в соответствии с этими ценностями. Так появился **Disroot**.
Проект базируется в Амстердаме, был основан **Muppeth** и **Antilopa** в 2015 году, поддерживается волонтёрами и опирается на поддержку сообщества. В 2017-2018 годах группа участников начала очень активно включаться в работу и тесно сотрудничать. В 2019 году двое из них, **Fede** и **Meaz**, официально вошли в состав основной команды, управляющей платформой. Два года спустя, в 2021 году, к задачам и обязанностям присоединился **Avg_Joe**.
Цель **Disroot** - изменить привычный способ взаимодействия людей в Интернете. Мы хотим не только показать, что существуют открытые и этичные альтернативы, но и то, что это единственный возможный способ вырваться из *огороженных садов*, предлагаемых и продвигаемых проприетарным ПО и корпорациями, либо с помощью нашей платформы, либо с помощью других, которые имеют схожие ценности и цели или даже собственные проекты.
Мы убеждены, что вместе сможем создать действительно независимую сеть, ориентированную на благо людей, а не на их эксплуатацию.

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -0,0 +1,14 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Disroot Team
Disroot wurde von **Antilopa** und **Muppeth** 2015 gegründet.
Im Juli 2019 hat sich das Team um **Fede** und **Meaz** erweitert.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

View file

@ -0,0 +1,18 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Disroot Team
**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
## Translations team
The Italian translation is the work of **@l3o**, French, Spanish and German are taken care by the **Core team**.
*If you're interested in helping us with this work, contact us [here](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*

View file

@ -0,0 +1,17 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Equipo de Disroot
**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
## Equipo de traducciones
La traducción italiana es obra de **@l3o**, las traducciones al francés, español y alemán están a cargo del **Equipo Principal**.
*Si tienen interés por ayudarnos con esta tarea, contáctennos [aquí](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*

View file

@ -0,0 +1,18 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Equipe Disroot
**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
## Equipe de traduction
La traduction italienne est le travail de **@l3o**, le français, l'espagnol et l'allemand sont pris en charge par l'équipe **Core**.
*Si vous souhaitez nous aider dans ce travail, contactez-nous [ici](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*.

View file

@ -0,0 +1,17 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Disroot Team
**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
## Team di traduzione
La traduzione in italiano è opera di **@l3o**, francese, spagnolo e tedesco sono a cura del **core team**.
*Se sei interessato ad aiutarci con questo lavoro, contattaci [qui](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*

View file

@ -0,0 +1,18 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Команда Disroot
**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
## Команда переводчиков
Перевод на итальянский язык выполняет **@l3o**. Французским, испанским и немецким языками занимается **Основная команда**.
*Если вы заинтересованны в помощи нам в этой работе, свяжитесь с нами [здесь](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1,24 +0,0 @@
---
title: Federation and Decentralization
fontcolor: '#555'
---
# Föderation und Dezentralisierung
<br>
![](about-organize.jpg)
---
<br>
Die meisten Internetdienste werden von einem zentralen Punkt aus betrieben, im Eigentum und Betrieb von gewinnorientierten Unternehmen. Diese speichern persönliche Daten ihrer Nutzer und analysieren sie mithilfe ausgeklügelter Algorithmen, um genaue und umfangreiche Profile ihrer 'Nutzer' anzulegen. Diese Informationen werden oft genutzt, um die Menschen zum Vorteil der Werbeindustrie auszubeuten. Ebenso können die Informationen durch staatliche Organisationen oder durch böswillige Hacker erlangt und ausgenutzt werden. Daten können ohne Warnung entfernt werden, aus fragwürdigen Gründen oder aufgrund regionaler Zensurvorgaben.
Ein dezentraler Service kann auf vielen Geräten laufen, im Eigentum verschiedener Individuen, Unternehmen oder Organisationen. Dank föderativer Protokolle können diese Instanzen miteinander interagieren und so ein Netzwerk formen, bestehend aus vielen Knotenpunkten (Servern, die die gleichen Dienste hosten). Es mag vorkommen, dass jemand es schafft, einen Knotenpunkt auszuschalten, aber niemals das gesamte Netzwerk. Bei einem solchen Aufbau ist Zensur praktisch unmöglich.
Ein solcher Aufbau ist nichts Neues. Überleg' Dir mal, wie Emails funktionieren: Du kannst Dir jeden Dienstanbieter (Provider) aussuchen, den Du willst, oder sogar einen eigenen Email-Dienst anbieten. Und trotzdem kannst Du mit jedem anderen Menschen in Kontakt treten, auch wenn dieser einen anderen Anbieter nutzt. Email baut auf einem dezentralen und föderativen Protokoll auf.
Diese zwei Prinzipien zusammengenommen bilden den Hintergrund für ein riesiges Netzwerk, das bei aller Größe eine eher einfache Infrastruktur mit relativ geringen Kosten benötigt. Jedes Gerät kann ein Server und ein gleichberechtigter Teilnehmer im Netzwerk werden. Vom kleinen Heimcomputer über den dedizierten Server bis hin zum Serverschrank. Dieser Ansatz gibt uns die Möglichkeit, das größte benutzereigene, globale Netzwerk zu erschaffen - genau so, wie das Internet mal sein sollte.
Wir wollen nicht, dass **Disroot** eine zentralisierte Entität wird, sondern vielmehr ein Teil einer viel größeren Gemeinschaft - ein Knotenpunkt von vielen. Wir hoffen, dass Andere sich inspirieren lassen, mehr Projekte mit den gleichen Zielen zu starten.

View file

@ -1,24 +0,0 @@
---
title: Federation and Decentralization
fontcolor: '#555'
---
# Federation and Decentralization
<br>
![](about-organize.jpg)
---
<br>
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.

View file

@ -1,24 +0,0 @@
---
title: Federation and Decentralization
fontcolor: '#555'
---
# Federación y Descentralización
<br>
![](about-organize_es.jpg)
---
<br>
La mayoría de los servicios de internet funcionan desde un punto centralizado, controlado y operado por corporaciones. Estas almacenan información privada de sus usuarixs y la analizan utilizando algoritmos avanzados con el fin de crear perfiles precisos de sus 'usuarixs'. Esta información es usada habitualmente para aprovecharse de la gente en beneficio de los anunciantes. Son datos que también pueden obtener instituciones gubernamentales o hackers malintencionados. La información incluso puede ser quitada sin aviso, por razones dudosas o políticas regionales de censura.
Un servicio descentralizado puede residir en varias máquinas, propiedad de diferentes individuos, compañías u organizaciones. Con protocolos de federación, esas instancias pueden interactuar y formar una red de muchos nodos (servidores que hospedan servicios similares). Unx podría dar de baja un nodo pero nunca la red entera. Con este tipo de organización, la censura es prácticamente imposible.
Piensa en cómo utilizamos el correo electrónico: puedes elegir cualquier proveedor de servicio o armar el tuyo propio, y aún así intercambiar correos con personas que usen otro proveedor de correo. El correo electrónico está construido sobre un protocolo descentralizado y federado.
Estos dos principios juntos, constituyen la base de una enorme red que depende de una estructura bastante simple y con costos relativamente bajos. Cualquier máquina puede convertirse en un servidor y ser un participante semejante en la red. Desde una pequeña computadora de escritorio en tu casa hasta un servidor dedicado o racks con múltiples servidores. Este abordaje proporciona la posibilidad de crear la más grande red global perteneciente a lxs usuarixs. Tal como fue planeado que fuera la Internet.
No deseamos que **Disroot** se convierta en una entidad centralizada sino una parte de una comunidad más grande, un nodo entre muchos. Esperamos que otrxs se sientan inspirados y estimuladxs a crear más proyectos con similares intenciones.

View file

@ -1,24 +0,0 @@
---
title: 'Fédération et Décentralisation'
fontcolor: '#555'
---
# Fédération et Décentralisation
<br>
![](about-organize.jpg)
---
<br>
La plupart des services Internet sont gérés à partir de points centralisés appartenant à des entreprises et gérés par celles-ci. Ces derniers stockent les données privées de leurs utilisateurs et les analysent à l'aide d'algorithmes poussés afin de créer des profils précis de leurs "utilisateurs". Ces informations sont souvent utilisées pour exploiter les personnes dans l'intérêt des annonceurs. Les informations peuvent également être obtenues par des institutions gouvernementales ou par des pirates informatiques malveillants. Les données peuvent être supprimées sans avertissement pour des raisons douteuses ou en raison de politiques régionales de censure.
Un service décentralisé peut résider sur plusieurs machines, appartenant à différentes personnes, entreprises ou organisations. Avec les protocoles de fédération, ces instances peuvent interagir et former un réseau de plusieurs nœuds (= serveurs hébergeant des services similaires). On peut être capable d'arrêter un nœud mais jamais tout le réseau. Dans une telle installation, la censure est pratiquement impossible.
Pensez à la façon dont nous utilisons le courrier électronique; vous pouvez choisir n'importe quel fournisseur de services ou créer le vôtre, et toujours échanger des courriels avec des personnes utilisant un autre fournisseur de courrier électronique. Le courrier électronique repose sur un protocole décentralisé et fédéré.
Ensemble, ces deux principes fondent un vaste réseau qui repose sur une infrastructure assez simple et des coûts relativement bas. N'importe quelle machine peut devenir un serveur et participer à part égale au réseau. D'un petit ordinateur de bureau chez vous à un serveur dédié ou des racks avec plusieurs serveurs. Cette approche offre la possibilité de créer le plus grand réseau mondial détenu par les utilisateurs - exactement comme l'Internet était censé l'être.
Nous ne voulons pas que Disroot devienne une entité centralisée, mais plutôt qu'elle fasse partie d'une communauté plus vaste - un nœud parmi tant d'autres. Nous espérons que d'autres seront inspirés à créer plus de projets avec des intentions similaires.

View file

@ -1,24 +0,0 @@
---
title: Federation and Decentralization
fontcolor: '#555'
---
# Federazione e decentralizzazione
<br>
![](about-organize.jpg)
---
<br>
La maggior parte dei servizi internet sono gestiti da un punto centralizzato di proprietà e gestiti da società. Questi memorizzano i dati privati dei loro utenti e li analizzano utilizzando algoritmi avanzati per creare profili accurati dei loro "utenti". Queste informazioni sono spesso utilizzate per sfruttare le persone per il bene degli inserzionisti. Le informazioni possono anche essere ottenute da istituzioni governative o da malintenzionati. I dati possono essere rimossi senza preavviso a causa di dubbi motivi o politiche regionali di censura.
Un servizio decentralizzato può risiedere su più macchine, di proprietà di persone, aziende o organizzazioni diverse. Con i protocolli di federazione queste istanze possono interagire e formare una rete di molti nodi (= server che ospitano servizi simili). Si potrebbe essere in grado di spegnere un nodo ma mai l'intera rete. In una tale configurazione la censura è praticamente impossibile.
Pensa a come usiamo la posta elettronica; puoi scegliere qualsiasi fornitore di servizi o creare il tuo e scambiare e-mail con persone che utilizzano un altro fornitore di servizi. La posta elettronica si basa su un protocollo decentralizzato e federato.
Questi due principi, insieme, fanno da sfondo ad un'enorme rete che dipende da un'infrastruttura piuttosto semplice e da costi relativamente bassi. Qualsiasi macchina può diventare un server e partecipare alla rete alla pari. Da un piccolo computer desktop a casa vostra a un server dedicato o rack con più server. Questo approccio offre la possibilità di creare la più grande rete globale di proprietà dell'utente - proprio come Internet doveva essere.
Non vogliamo che Disroot diventi un'entità centralizzata, ma piuttosto una parte di una comunità più ampia - un nodo su molti. Speriamo che altri siano ispirati a creare più progetti con intenzioni simili.

View file

@ -1,24 +0,0 @@
---
title: Federation and Decentralization
fontcolor: '#555'
---
# Объединение и Децентрализация
<br>
![](about-organize_ru.jpg)
---
<br>
Большинство интернет сервисов работают из централизованных точек принадлежащих корпорациям. Они собирают личную информацию своих пользователей и анализируют её, используя продвинутые алгормитмы, что бы создать точные профили своих "пользователей". Эта информация часто используется для эксплуатирования людей ради рекламодателей. Информация так же может быть получена государственными учреждениями или злонамеренными хакерами. Данные могут быть удалены без предупреждений в связи с сомнительными обстоятельствами или политикой региональной цензуры.
Децентрализованный сервис может находиться на нескольких машинах, принадлежащих разным людям, компаниям или организациям. С протоколами объединения эти установки могут взаимодействовать и формировать одну сеть из нескольких узлов (сервера, держащие похожие сервисы). Может отключиться один узел, но вся сеть - никогда. При таком раскладе цензура практически нереализуема.
Представьте, как мы используем электронную почту; вы можете выбрать любого поставщика сервиса, или же настроить собственный сервис и по прежнему обмениваться письмами с людьми используя того же поставщика. Электронная почта построена на децентрализованном и федеративном протоколе.
Эти два принципа, вместе, устанавливают фон для огромной сети, которая зависит от довольно простой инфраструктуры и относительно немного стóит. Любая машина может стать сервером и участником в сети. От маленького домашнего компьютера до выделенного сервера на стеллаже. Такой подход предоставляет возможность создать крупнейшую глобальную пользовательскую сеть - каким интернет и должен быть.
Мы желаем, что бы **Disroot** становился не централизованным объектом, а довольно крупным сообществом - одним узлом из многих. Мы надеемся, что другие будут вдохновлены создавать больше проектов с похожими намерениями.

View file

@ -0,0 +1,26 @@
---
title: Föderation und Dezentralisierung
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize.jpg)
---
<br>
# Föderation und Dezentralisierung
Die meisten Internetdienste werden von einem zentralen Punkt aus betrieben, im Eigentum und Betrieb von gewinnorientierten Unternehmen. Diese speichern persönliche Daten ihrer Nutzer und analysieren sie mithilfe ausgeklügelter Algorithmen, um genaue und umfangreiche Profile ihrer 'Nutzer' anzulegen. Diese Informationen werden oft genutzt, um die Menschen zum Vorteil der Werbeindustrie auszubeuten. Ebenso können die Informationen durch staatliche Organisationen oder durch böswillige Hacker erlangt und ausgenutzt werden. Daten können ohne Warnung entfernt werden, aus fragwürdigen Gründen oder aufgrund regionaler Zensurvorgaben.
Ein dezentraler Service kann auf vielen Geräten laufen, im Eigentum verschiedener Individuen, Unternehmen oder Organisationen. Dank föderativer Protokolle können diese Instanzen miteinander interagieren und so ein Netzwerk formen, bestehend aus vielen Knotenpunkten (Servern, die die gleichen Dienste hosten). Es mag vorkommen, dass jemand es schafft, einen Knotenpunkt auszuschalten, aber niemals das gesamte Netzwerk. Bei einem solchen Aufbau ist Zensur praktisch unmöglich.
Ein solcher Aufbau ist nichts Neues. Überleg' Dir mal, wie E&#8209;Mails funktionieren: Du kannst Dir jeden Dienstanbieter (Provider) aussuchen, den Du willst, oder sogar einen eigenen E&#8209;Mail-Dienst anbieten. Und trotzdem kannst Du mit jedem anderen Menschen in Kontakt treten, auch wenn dieser einen anderen Anbieter nutzt. E&#8209;Mail baut auf einem dezentralen und föderativen Protokoll auf.
Diese zwei Prinzipien zusammengenommen bilden den Hintergrund für ein riesiges Netzwerk, das bei aller Größe eine eher einfache Infrastruktur mit relativ geringen Kosten benötigt. Jedes Gerät kann ein Server und ein gleichberechtigter Teilnehmer im Netzwerk werden. Vom kleinen Heimcomputer über den dedizierten Server bis hin zum Serverschrank. Dieser Ansatz gibt uns die Möglichkeit, das größte benutzereigene, globale Netzwerk zu erschaffen - genau so, wie das Internet mal sein sollte.
Wir wollen nicht, dass **Disroot** eine zentralisierte Entität wird, sondern vielmehr ein Teil einer viel größeren Gemeinschaft - ein Knotenpunkt von vielen. Wir hoffen, dass Andere sich inspirieren lassen, mehr Projekte mit den gleichen Zielen zu starten.

View file

@ -0,0 +1,26 @@
---
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize.jpg)
---
<br>
# 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.

View file

@ -0,0 +1,26 @@
---
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize_es.jpg)
---
<br>
# Federación y Descentralización
La mayoría de los servicios de internet funcionan desde un punto centralizado, controlado y operado por corporaciones. Estas almacenan información privada de sus "usuarios" y "usuarias" y la analizan utilizando algoritmos avanzados con el fin de crear perfiles precisos de ellos y ellas. Esta información se usa habitualmente para aprovecharse de la gente en beneficio de los anunciantes. Son datos que también pueden obtener instituciones gubernamentales o hackers malintencionados. La información incluso puede ser eliminada sin aviso, por razones dudosas o por políticas regionales de censura.
Un servicio descentralizado puede residir en varias máquinas, propiedad de diferentes individuos, compañías u organizaciones. Con protocolos de federación, esas instancias pueden interactuar y formar una red de muchos nodos (servidores que hospedan servicios similares). Se podría dar de baja un nodo pero nunca la red entera. Con este tipo de organización, la censura es prácticamente imposible.
Piensen en cómo utilizamos el correo electrónico: podemos elegir cualquier proveedor de servicio o armar el nuestro propio, y aún así intercambiar correos con personas que usen otro proveedor de correo. El correo electrónico está construido sobre un protocolo descentralizado y federado.
Estos dos principios juntos, constituyen la base de una enorme red que depende de una estructura bastante simple y con costos relativamente bajos. Cualquier máquina puede convertirse en un servidor y ser un participante semejante en la red. Desde una pequeña computadora de escritorio en sus casas hasta un servidor dedicado o racks con múltiples servidores. Este abordaje proporciona la posibilidad de crear la más grande red global perteneciente a las personas usuarias. Tal como se concibió que fuera la Internet.
No deseamos que **Disroot** se convierta en una entidad centralizada sino una parte de una comunidad más grande, un nodo entre muchos. Esperamos que otras personas se sientan inspiradas y estimuladas a crear más proyectos con similares intenciones.

View file

@ -0,0 +1,26 @@
---
title: 'Fédération et Décentralisation'
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize.jpg)
---
<br>
# Fédération et Décentralisation
La plupart des services Internet sont gérés à partir de points centralisés appartenant à des entreprises et gérés par celles-ci. Ces derniers stockent les données privées de leurs utilisateurs et les analysent à l'aide d'algorithmes poussés afin de créer des profils précis de leurs "utilisateurs". Ces informations sont souvent utilisées pour exploiter les personnes dans l'intérêt des annonceurs. Les informations peuvent également être obtenues par des institutions gouvernementales ou par des pirates informatiques malveillants. Les données peuvent être supprimées sans avertissement pour des raisons douteuses ou en raison de politiques régionales de censure.
Un service décentralisé peut résider sur plusieurs machines, appartenant à différentes personnes, entreprises ou organisations. Avec les protocoles de fédération, ces instances peuvent interagir et former un réseau de plusieurs nœuds (= serveurs hébergeant des services similaires). On peut être capable d'arrêter un nœud mais jamais tout le réseau. Dans une telle installation, la censure est pratiquement impossible.
Pensez à la façon dont nous utilisons le courrier électronique; vous pouvez choisir n'importe quel fournisseur de services ou créer le vôtre, et toujours échanger des courriels avec des personnes utilisant un autre fournisseur de courrier électronique. Le courrier électronique repose sur un protocole décentralisé et fédéré.
Ensemble, ces deux principes fondent un vaste réseau qui repose sur une infrastructure assez simple et des coûts relativement bas. N'importe quelle machine peut devenir un serveur et participer à part égale au réseau. D'un petit ordinateur de bureau chez vous à un serveur dédié ou des racks avec plusieurs serveurs. Cette approche offre la possibilité de créer le plus grand réseau mondial détenu par les utilisateurs - exactement comme l'Internet était censé l'être.
Nous ne voulons pas que Disroot devienne une entité centralisée, mais plutôt qu'elle fasse partie d'une communauté plus vaste - un nœud parmi tant d'autres. Nous espérons que d'autres seront inspirés à créer plus de projets avec des intentions similaires.

View file

@ -0,0 +1,26 @@
---
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize.jpg)
---
<br>
# Federazione e decentralizzazione
La maggior parte dei servizi internet sono gestiti da un punto centralizzato di proprietà e gestiti da società. Questi memorizzano i dati privati dei loro utenti e li analizzano utilizzando algoritmi avanzati per creare profili accurati dei loro "utenti". Queste informazioni sono spesso utilizzate per sfruttare le persone per il bene degli inserzionisti. Le informazioni possono anche essere ottenute da istituzioni governative o da malintenzionati. I dati possono essere rimossi senza preavviso a causa di dubbi motivi o politiche regionali di censura.
Un servizio decentralizzato può risiedere su più macchine, di proprietà di persone, aziende o organizzazioni diverse. Con i protocolli di federazione queste istanze possono interagire e formare una rete di molti nodi (= server che ospitano servizi simili). Si potrebbe essere in grado di spegnere un nodo ma mai l'intera rete. In una tale configurazione la censura è praticamente impossibile.
Pensa a come usiamo la posta elettronica; puoi scegliere qualsiasi fornitore di servizi o creare il tuo e scambiare e-mail con persone che utilizzano un altro fornitore di servizi. La posta elettronica si basa su un protocollo decentralizzato e federato.
Questi due principi, insieme, fanno da sfondo ad un'enorme rete che dipende da un'infrastruttura piuttosto semplice e da costi relativamente bassi. Qualsiasi macchina può diventare un server e partecipare alla rete alla pari. Da un piccolo computer desktop a casa vostra a un server dedicato o rack con più server. Questo approccio offre la possibilità di creare la più grande rete globale di proprietà dell'utente - proprio come Internet doveva essere.
Non vogliamo che Disroot diventi un'entità centralizzata, ma piuttosto una parte di una comunità più ampia - un nodo su molti. Speriamo che altri siano ispirati a creare più progetti con intenzioni simili.

View file

@ -0,0 +1,26 @@
---
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
<br>
<br>
![](about-organize_ru.jpg)
---
<br>
# Объединение и Децентрализация
Большинство интернет сервисов работают из централизованных точек принадлежащих корпорациям. Они собирают личную информацию своих пользователей и анализируют её, используя продвинутые алгормитмы, что бы создать точные профили своих "пользователей". Эта информация часто используется для эксплуатирования людей ради рекламодателей. Информация так же может быть получена государственными учреждениями или злонамеренными хакерами. Данные могут быть удалены без предупреждений в связи с сомнительными обстоятельствами или политикой региональной цензуры.
Децентрализованный сервис может находиться на нескольких машинах, принадлежащих разным людям, компаниям или организациям. С протоколами объединения эти установки могут взаимодействовать и формировать одну сеть из нескольких узлов (сервера, держащие похожие сервисы). Может отключиться один узел, но вся сеть - никогда. При таком раскладе цензура практически нереализуема.
Представьте, как мы используем электронную почту; вы можете выбрать любого поставщика сервиса, или же настроить собственный сервис и по прежнему обмениваться письмами с людьми используя того же поставщика. Электронная почта построена на децентрализованном и федеративном протоколе.
Эти два принципа, вместе, устанавливают фон для огромной сети, которая зависит от довольно простой инфраструктуры и относительно немного стóит. Любая машина может стать сервером и участником в сети. От маленького домашнего компьютера до выделенного сервера на стеллаже. Такой подход предоставляет возможность создать крупнейшую глобальную пользовательскую сеть - каким интернет и должен быть.
Мы желаем, что бы **Disroot** становился не централизованным объектом, а довольно крупным сообществом - одним узлом из многих. Мы надеемся, что другие будут вдохновлены создавать больше проектов с похожими намерениями.

View file

@ -0,0 +1,12 @@
---
title: Online-donation
bgcolor: '#1F5C60'
wider_column: left
fontcolor: '#ffffff'
---
Die Disroot-Server werden in einem Rechenzentrum gehostet, das laut Betreiber ausschließlich erneuerbare Energien nutzt.
---
<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Diese Website wird umweltfreundlich gehostet - geprüft von thegreenwebfoundation.org" style="height:100px"></a>

View file

@ -0,0 +1,12 @@
---
title: Online-donation
bgcolor: '#1F5C60'
wider_column: left
fontcolor: '#ffffff'
---
Disroot servers are hosted in a data-center using renewable energy.
---
<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>

View file

@ -0,0 +1,12 @@
---
title: Online-donation
bgcolor: '#1F5C60'
wider_column: left
fontcolor: '#ffffff'
---
Los servidores de **Disroot** están alojados en un data center que utiliza energía renovable.
---
<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Este sitio utiliza energía renovable - Verificado por thegreenwebfoundation.org" style="height:100px"></a>

View file

@ -0,0 +1,12 @@
---
title: Online-donation
bgcolor: '#1F5C60'
wider_column: left
fontcolor: '#ffffff'
---
I server di Disroot sono hostati in un data-center che usa energia rinnovabile.
---
<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Questo sito usa energia rinnovabile - verificato da thegreenwebfoundation.org" style="height:100px"></a>

View file

@ -0,0 +1,12 @@
---
title: Online-donation
bgcolor: '#1F5C60'
wider_column: left
fontcolor: '#ffffff'
---
Сервера Disroot стоят в дата-центре, использующем возобновляемые источники энергии.
---
<a href="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>

View file

@ -1,21 +0,0 @@
---
title: privacy
fontcolor: '#555'
---
<br>
Software kann erschaffen und geformt werden, wie man das möchte. Jeder Button, jede Farbe und jede Verknüpfung, die wir im Internet sehen, wurde von irgendjemand hingetan. Wenn wir die Anwendungen nutzen, die uns zur Verfügung gestellt werden, sehen wir meistens nicht - oft ist es uns auch egal - was hinter der Benutzeroberfläche passiert. Wir verbinden und mit anderen Menschen, speichern unsere Dateien, organisieren Besprechungen und Festivals, senden Emails oder chatten stundenlang - Und all das ganz einfach auf magische Weise!
In den letzten ein oder zwei Jahrzehnten wurden Informationen immer wertvoller und gleichzeitig immer einfacher zu sammeln und zu verarbeiten. Wir haben uns daran gewöhnt, analysiert zu werden, blindlings Allgemeine Geschäftsbedingungen, Nutzungsbedingungen und Datenschutzerklärungen zu "unserem eigenen Besten" zu akzeptieren, Obrigkeiten und Multimilliarden-Dollar-Unternehmen den Schutz unserer Interessen anzuvertrauen. Dabei sind wir die ganze Zeit nur das Produkt in deren 'Menschenfarmen'.
**Sei der Herr über Deine eigenen Daten:**
Viele Netzwerke nutzen Deine Daten, um Geld damit zu verdienen, Deine Interaktionen zu analysieren und die daraus gewonnenen Informationen zu Werbezwecken (und mehr) zu nutzen. **Disroot** hat kein Interesse an Deinen Daten und nutzt sie für keinen anderen Zweck, als Dir die Verbindung mit unserem Service und dessen Nutzung zu ermöglichn.
Deine Dateien in der Cloud sind verschlüsselt mit Deinem Benutzerpasswort, jeder Wegwerf-Container und jede auf **Lufi** hochgeladene Datei sind von der Nutzerseite aus verschlüsselt. Das bedeutet, dass nicht mal die Server-Administratoren Zugriff auf Deine Daten haben. Wann immer es die Möglichkeit zur Verschlüsselung gibt, aktivieren wir sie, und wenn das nihct möglich ist, raten wir zur Nutzung externer Verschlüsselungssoftware. Je weniger wir, die Administratoren, über Deine Daten wissen, umso besser :D. (Tipp des Tages: *Verliere niemals Dein Passwort!*) Sieh Dir dazu auch [dieses Tutorial](https://howto.disroot.org/de/tutorials/user/account/ussc) an.
---
# Datenschutz
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,21 +0,0 @@
---
title: privacy
fontcolor: '#555'
---
<br>
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 lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/ussc)
---
# Privacy
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,21 +0,0 @@
---
title: privacy
fontcolor: '#555'
---
<br>
El software se puede crear y darle cualquier forma. Cada botón, cada color y cada enlace que vemos y utilizamos en la web fue puesto ahí por alguien. Cuando hacemos uso de las aplicaciones que nos ofrecen, generalmente no vemos (y a veces no nos interesa) mucho de lo que ocurre detrás de la interfaz que utilizamos. Nos conectamos con otra gente, almacenamos nuestros archivos, organizamos reuniones y festivales, enviamos correos o chateamos durante horas y todo sucede mágicamente.
En las últimas décadas la información se ha vuelto muy valiosa y cada vez más fácil de recopilar y procesar. Estamos acostumbradxs a ser analizadxs, aceptando ciegamente términos y condiciones por "nuestro propio bien", confiando en autoridades y compañías multimillonarias para que protejan nuestros intereses, mientras todo el tiempo somos el producto en sus 'granjas de personas'.
**Se dueño de tu información:**
Muchas redes usan tus datos para hacer dinero analizando tus interacciones y utilizando esta información para publicitarte cosas. **Disroot** no utiliza tus datos con ningún otro propósito que no sea permitir conectarte y usar el servicio.
Tus archivos en la nube están cifrados con tu contraseña de usuarix, cada [pastebin](https://es.wikipedia.org/wiki/Pastebin) y archivo subido al servicio de **Lufi** está cifrado del lado del cliente también, lo que significa que ni siquiera los administradores del sistema tienen acceso a tus datos. Siempre que exista una posibilidad para cifrar, la habilitamos y si no es posible, aconsejamos utilizar un software de cifrado externo. Cuanto menos sepamos, como administradores, sobre tu información, mejor :D. (Consejo del día: *¡Nunca pierdas tu contraseña!)* [Ver tutorial](https://howto.disroot.org/es/tutorials/user/account/ussc)
---
# Privacidad
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,21 +0,0 @@
---
title: 'vie privée'
fontcolor: '#555'
---
<br>
Les logiciels peuvent être créés et transformés en n'importe quoi. Tous les boutons, toutes les couleurs et tous les liens que nous voyons et utilisons sur le web y ont été placés par quelqu'un. Lorsque nous utilisons les applications qui nous sont fournies, nous ne voyons généralement pas - et parfois nous nous en fichons - ce qui se passe derrière l'interface que nous utilisons. Nous communiquons avec d'autres personnes, nous stockons nos dossiers, organisons des réunions et des festivals, envoyons des courriels ou discutons pendant des heures et tout cela se passe comme par magie.
Au cours des dernières décennies, l'information est devenue très précieuse et de plus en plus facile à recueillir et à traiter. Nous avons l'habitude d'être analysés, acceptant aveuglément les termes et conditions pour "notre propre bien", faisant confiance aux autorités et à des entreprises de plusieurs milliards de dollars pour protéger nos intérêts, alors que nous sommes toujours le produit dans leurs "fermes de gens".
**Posséder vos propres données:**
De nombreux réseaux utilisent vos données pour gagner de l'argent en analysant vos interactions et en utilisant cette information pour vous fournir de la publicités. Disroot n'utilise pas vos données à d'autres fins que celles de vous permettre de vous connecter et d'utiliser le service.
Vos fichiers sur le cloud sont chiffrés avec votre mot de passe utilisateur, chaque bin-paste et fichier uploadé sur le service Lufi est également chiffré côté client, ce qui signifie que même les administrateurs du serveur n'ont pas accès à vos données. Chaque fois qu'il y a une possibilité de chiffrement, nous l'activons et si ce n'est pas possible, nous conseillons d'utiliser un logiciel de chiffrement externe. En tant qu'admins, moins nous connaissons vos données, mieux c'est :D. (Conseil du jour: Ne perdez jamais votre mot de passe!) [lisez ce tutoriel](https://howto.disroot.org/fr/tutorials/user/account/ussc)
---
# Vie privée
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,21 +0,0 @@
---
title: privacy
fontcolor: '#555'
---
<br>
Il software può essere creato e modellato in qualsiasi cosa. Ogni pulsante, ogni colore e ogni link che vediamo e usiamo sul web è stato messo lì da qualcuno. Quando usiamo le applicazioni che ci vengono fornite, in genere non vediamo - e a volte non ci interessa - molto di ciò che accade dietro l'interfaccia che usiamo. Ci mettiamo in contatto con altre persone, conserviamo i nostri file, organizziamo incontri e festival, mandiamo e-mail o chiacchieriamo per ore e tutto questo accade per magia.
Negli ultimi decenni le informazioni sono diventate molto preziose e sempre più facili da raccogliere ed elaborare. Siamo abituati ad essere analizzati, accettando ciecamente termini e condizioni per "il nostro bene", confidando nelle autorità e nelle aziende multimiliardarie per proteggere i nostri interessi, mentre noi siamo sempre il prodotto nelle loro " fattorie della gente".
**Possiedi i tuoi dati personali:**
Molte reti utilizzano i tuoi dati per fare soldi analizzando le tue interazioni e utilizzando queste informazioni per pubblicizzare le cose a voi. Disroot non utilizza i vostri dati per scopi diversi da quelli che vi permettono di connettervi e utilizzare il servizio.
I tuoi file sul cloud sono criptati con la tua password utente, ogni bin-paste e file caricati sul servizio Lufi è criptato anche lato client, il che significa che anche gli amministratori dei server non hanno accesso ai tuoi dati. Ogni volta che c'è la possibilità di crittografia, la abilitiamo e, se non è possibile, consigliamo di utilizzare un software di crittografia esterno. Come amministratori, meno noi conosciamo i vostri dati, meglio è :D. (Consiglio del giorno: non perdere mai la password!) [guarda la guida](https://howto.disroot.org/it/tutorials/user/account/ussc)
---
# Privacy
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,21 +0,0 @@
---
title: privacy
fontcolor: '#555'
---
<br>
Программное обеспечение может быть создано и сформированно во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
В последние несколько десятков лет информация стала очень ценной, и её всё проще собирать и обрабатывать. Мы привыкли находиться под постоянным анализом, слепо принимать условия и соглашения для "своего же блага", доверяя властям и мульти-миллиардным компаниям защищать наши интересы, превращая всех нас в продукт их "человеческих ферм".
**Владей своими данными:**
Многие сети используют ваши данные, что бы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это не возможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (Совет дня: *Никогда не теряйте свой пароль!*) [Просмотрите руководство](https://howto.disroot.org/ru/tutorials/user/account/ussc)
---
# Конфиденциальность
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,23 @@
---
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Datenschutz
Software kann erschaffen und geformt werden, wie man das möchte. Jeder Button, jede Farbe und jede Verknüpfung, die wir im Internet sehen, wurde von irgendjemand hingetan. Wenn wir die Anwendungen nutzen, die uns zur Verfügung gestellt werden, sehen wir meistens nicht - oft ist es uns auch egal - was hinter der Benutzeroberfläche passiert. Wir verbinden und mit anderen Menschen, speichern unsere Dateien, organisieren Besprechungen und Festivals, senden Emails oder chatten stundenlang - Und all das ganz einfach auf magische Weise!
In den letzten ein oder zwei Jahrzehnten wurden Informationen immer wertvoller und gleichzeitig immer einfacher zu sammeln und zu verarbeiten. Wir haben uns daran gewöhnt, analysiert zu werden, blindlings Allgemeine Geschäftsbedingungen, Nutzungsbedingungen und Datenschutzerklärungen zu "unserem eigenen Besten" zu akzeptieren, Obrigkeiten und Multimilliarden-Dollar-Unternehmen den Schutz unserer Interessen anzuvertrauen. Dabei sind wir die ganze Zeit nur das Produkt in deren 'Menschenfarmen'.
**Sei der Herr über Deine eigenen Daten:**
Viele Netzwerke nutzen Deine Daten, um Geld damit zu verdienen, Deine Interaktionen zu analysieren und die daraus gewonnenen Informationen zu Werbezwecken (und mehr) zu nutzen. **Disroot** hat kein Interesse an Deinen Daten und nutzt sie für keinen anderen Zweck, als Dir die Verbindung mit unserem Service und dessen Nutzung zu ermöglichen.
Deine Dateien in der Cloud sind verschlüsselt mit Deinem Benutzerpasswort, jeder Wegwerf-Container und jede auf **Lufi** hochgeladene Datei sind von der Nutzerseite aus verschlüsselt. Das bedeutet, dass nicht mal die Server-Administratoren Zugriff auf Deine Daten haben. Wann immer es die Möglichkeit zur Verschlüsselung gibt, aktivieren wir sie, und wenn das nicht möglich ist, raten wir zur Nutzung externer Verschlüsselungssoftware. Je weniger wir, die Administratoren, über Deine Daten wissen, umso besser :D.
(_**Tipp des Tages**: Da deine Daten auf **Nextcloud** mit deinem Benutzerpasswort verschlüsselt sind, kannst du, wenn du dein Passwort vergisst, nicht mehr auf deine Daten zugreifen, also **stelle sicher, dass du dein Passwort NIEMALS verlierst!** (Wir empfehlen einen Passwort-Manager zu benutzen)_) [Lies dieses Tutorial](https://howto.disroot.org/de/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,22 @@
---
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Privacy
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**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manager)_) [Read this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,22 @@
---
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Privacidad
El software se puede crear y darle cualquier forma. Cada botón, cada color y cada enlace que vemos y utilizamos en la web fue puesto ahí por alguien. Cuando hacemos uso de las aplicaciones que nos ofrecen, generalmente no vemos (y muchas veces, no nos interesa) lo que ocurre detrás de la interfaz que utilizamos. Nos conectamos con otra gente, almacenamos nuestros archivos, organizamos reuniones y festivales, enviamos correos o chateamos durante horas y todo sucede "mágicamente".
En las últimas décadas la información se ha vuelto muy valiosa y cada vez más fácil de recopilar y procesar. Las personas estamos acostumbradas a ser analizadas, aceptando ciegamente términos y condiciones por "nuestro propio bien", confiando en autoridades gubernamentales y compañías multimillonarias para que protejan nuestros intereses, mientras que en realidad todo el tiempo somos productos en sus 'granjas de personas'.
**Seamos dueños de nuestros datos:**
Muchas redes usan nuestros datos para hacer dinero analizando nuestras interacciones y utilizando esta información para publicitarnos cosas. **Disroot** no utiliza tus datos con ningún otro propósito que no sea permitir conectarte y usar el servicio.
Tus archivos en la nube están cifrados con tu contraseña de usuarie, cada [pastebin](https://es.wikipedia.org/wiki/Pastebin) y archivo subido al servicio de **Lufi** está cifrado del lado del cliente también, lo que significa que ni siquiera los administradores del sistema tienen acceso a tus datos. Siempre que exista una posibilidad para cifrar, la habilitamos y si no es posible, aconsejamos utilizar un software de cifrado externo. Cuanto menos sepamos, como administradores, sobre tu información, mejor :D. (Consejo del día: *¡Nunca pierdan su contraseña!)* [Ver tutorial](https://howto.disroot.org/es/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,22 @@
---
title: 'vie privée'
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Vie privée
Les logiciels peuvent être créés et transformés en n'importe quoi. Tous les boutons, toutes les couleurs et tous les liens que nous voyons et utilisons sur le web y ont été placés par quelqu'un. Lorsque nous utilisons les applications qui nous sont fournies, nous ne voyons généralement pas - et parfois nous nous en fichons - ce qui se passe derrière l'interface que nous utilisons. Nous communiquons avec d'autres personnes, nous stockons nos dossiers, organisons des réunions et des festivals, envoyons des courriels ou discutons pendant des heures et tout cela se passe comme par magie.
Au cours des dernières décennies, l'information est devenue très précieuse et de plus en plus facile à recueillir et à traiter. Nous avons l'habitude d'être analysés, acceptant aveuglément les termes et conditions pour "notre propre bien", faisant confiance aux autorités et à des entreprises de plusieurs milliards de dollars pour protéger nos intérêts, alors que nous sommes toujours le produit dans leurs "fermes de gens".
**Possédez vos propres données:**
De nombreux réseaux utilisent vos données pour gagner de l'argent en analysant vos interactions et en utilisant cette information pour vous fournir de la publicités. Disroot n'utilise pas vos données à d'autres fins que celles de vous permettre de vous connecter et d'utiliser le service.
Vos fichiers sur le cloud sont chiffrés avec votre mot de passe utilisateur, chaque bin-paste et fichier uploadé sur le service Lufi est également chiffré côté client, ce qui signifie que même les administrateurs du serveur n'ont pas accès à vos données. Chaque fois qu'il y a une possibilité de chiffrement, nous l'activons et si ce n'est pas possible, nous conseillons d'utiliser un logiciel de chiffrement externe. En tant qu'admins, moins nous connaissons vos données, mieux c'est :D. (_**Conseil du jour** : Puisque vos fichiers sur **Nextcloud** sont chiffrés avec votre mot de passe d'utilisateur, si vous l'oubliez, vous ne pourrez plus accéder à vos fichiers, donc **assurez-vous de ne JAMAIS perdre votre mot de passe** (nous suggérons d'utiliser un gestionnaire de mots de passe)_). [Lire ce tutoriel](https://howto.disroot.org/fr/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,22 @@
---
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Privacy
Il software può essere creato e modellato in qualsiasi cosa. Ogni pulsante, ogni colore e ogni link che vediamo e usiamo sul web è stato messo lì da qualcuno. Quando usiamo le applicazioni che ci vengono fornite, in genere non vediamo - e a volte non ci interessa - molto di ciò che accade dietro l'interfaccia che usiamo. Ci mettiamo in contatto con altre persone, conserviamo i nostri file, organizziamo incontri e festival, mandiamo e-mail o chiacchieriamo per ore e tutto questo accade per magia.
Negli ultimi decenni le informazioni sono diventate molto preziose e sempre più facili da raccogliere ed elaborare. Siamo abituati ad essere analizzati, accettando ciecamente termini e condizioni per "il nostro bene", confidando nelle autorità e nelle aziende multimiliardarie per proteggere i nostri interessi, mentre noi siamo sempre il prodotto nelle loro " fattorie della gente".
**Possiedi i tuoi dati personali:**
Molte reti utilizzano i tuoi dati per fare soldi analizzando le tue interazioni e utilizzando queste informazioni per pubblicizzare le cose a voi. Disroot non utilizza i vostri dati per scopi diversi da quelli che vi permettono di connettervi e utilizzare il servizio.
I tuoi file sul cloud sono criptati con la tua password utente, ogni bin-paste e file caricati sul servizio Lufi è criptato anche lato client, il che significa che anche gli amministratori dei server non hanno accesso ai tuoi dati. Ogni volta che c'è la possibilità di crittografia, la abilitiamo e, se non è possibile, consigliamo di utilizzare un software di crittografia esterno. Come amministratori, meno noi conosciamo i vostri dati, meglio è :D. (_**Tip of the day**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manager)_) [Read this tutorial](https://howto.disroot.org/it/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -0,0 +1,22 @@
---
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
# Конфиденциальность
Программное обеспечение может быть создано и сформировано во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
В последние несколько десятков лет информация стала очень ценной, и её всё проще собирать и обрабатывать. Мы привыкли находиться под постоянным анализом, слепо принимать условия и соглашения для "своего же блага", доверяя властям и мульти-миллиардным компаниям защищать наши интересы, превращая всех нас в продукт их "человеческих ферм".
**Владей своими данными:**
Многие сети используют ваши данные, чтобы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это невозможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (_**Совет дня**: Пока ваши файлы на **Nextcloud** зашифрованы пользовательским паролем, если вы забудете его, то потеряете доступ к вашим файлам снова, так что **старайтесь НИКОГДА не забывать свой пароль!** (Мы предпочитаем использование менеджера паролей)_) [Прочтите об этом здесь](https://howto.disroot.org/ru/tutorials/user/account/administration/ussc)
---
<br>
![](priv1.jpg?lightbox=1024)
![](priv2.jpg?lightbox=1024)

View file

@ -1,16 +0,0 @@
---
title: Transparency
fontcolor: '#555'
---
# Transparenz und Offenheit
![](about-trust.png)
---
<br>
Für **Disroot** nutzen wir zu 100% freie und quelloffene Software. Das heißt, dass der Quellcode (die Anweisungen, die die Software abarbeitet) öffentlich zugänglich ist. Jeder kann Verbesserungen oder Anpassungen zu der Software hinzufügen und sie kann jederzeit überprüft und kontrolliert werden - keine versteckten Hintertürchen oder bösartigen Schadprogramme.
Wir wollen völlig offen und transparent sein den Menschen gegenüber, die unser Angebot nutzen. Daher veröffentlichen wir Informationen über den momentanen Status des Projekts, die finanzielle Situation, unsere Pläne und Ideen. Wir freuen uns auch über Vorschläge und Feedback, damit wir allen **Disrootern** das bestmögliche Nutzererlebnis bieten können.

View file

@ -1,16 +0,0 @@
---
title: Transparency
fontcolor: '#555'
---
# Transparency and openness
![](about-trust.png)
---
<br>
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**.

View file

@ -1,16 +0,0 @@
---
title: Transparency
fontcolor: '#555'
---
# Transparencia y apertura
![](about-trust.png)
---
<br>
En **Disroot** utilizamos software 100% libre y de código de abierto. Esto significa que el [código fuente](https://es.wikipedia.org/wiki/C%C3%B3digo_fuente) (la forma en que opera el software) es de acceso público. Cualquiera está en condiciones de contribuir con mejoras o ajustes al software y este puede ser auditado y controlado en cualquier momento, sin [puertas traseras](https://es.wikipedia.org/wiki/Puerta_trasera) ocultas u otro [malware](https://es.wikipedia.org/wiki/Malware) malintencionado.
Queremos ser completamente transparentes y abiertos con las personas que utilizan nuestros servicios y por ello publicamos información sobre el estado actual del proyecto, la condición financiera, nuestros planes e ideas. También nos gustaría escuchar sus sugerencias y comentarios así podemos dar la mejor experiencia posible a todxs lxs **Disrooters**.

View file

@ -1,16 +0,0 @@
---
title: Transparence
fontcolor: '#555'
---
# Transparence et ouverture
![](about-trust.png)
---
<br>
Chez **Disroot**, nous utilisons des logiciels 100% libres et open source. Cela signifie que le code source (le fonctionnement du logiciel) est accessible au public. N'importe qui est en mesure d'apporter des améliorations ou des ajustements au logiciel et il peut être audité et contrôlé à tout moment - pas de portes dérobées cachées ou d'autres logiciels malveillants.
Nous voulons être totalement transparents et ouverts à l'égard des personnes qui utilisent nos services et, à cet effet, nous publions des informations sur l'état actuel du projet, la situation financière, nos plans et nos idées. Nous aimerions également connaître vos suggestions et vos commentaires afin de pouvoir offrir la meilleure expérience possible à tous les utilisateurs de Disroot.

Some files were not shown because too many files have changed in this diff Show more