Commit graph

1938 commits

Author SHA1 Message Date
b741693b94 Merge pull request 'overview update' (#267) from overview_oct_nov_2021 into master
Reviewed-on: #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
666ce9e508 overview update 2021-12-09 16:02:32 +01:00
f2b4a3f0fa Merge pull request 'DisNews #3' (#265) from news03-2021 into master
Reviewed-on: #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
eea01abe24 Small fix on "clickbait" line. 2021-11-20 19:40:55 -03:00
a32a9c32da Small modifications on text (as requested) (English and Spanish version) 2021-11-20 19:34:47 -03:00
463e88698a Sp translation of blogpost: Small typo fixed 2021-11-20 17:12:40 -03:00
d63a854e2f Poll link added + Spanish translation 2021-11-20 17:09:19 -03:00
c8d61c7b86 Blogpost #3 2021-11-20 02:32:38 -03:00
22201e9f4e Fix tiny typo (#264)
Reviewed-on: #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
f67e334b05 remove mentions of alias on home page (#263)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #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
d56d0e972c Merge pull request 'frequency_fix_french' (#262) from frequency_fix_french into master
Reviewed-on: #262
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-15 15:01:24 +00:00
33a8e23db3 more fixes 2021-11-09 22:55:20 +01:00
eb50368cb2 small fixes to french translation 2021-11-09 22:53:28 +01:00
73b156cc19 Merge pull request 'removed contribution frequency from form' (#261) from domain_form_fix into master
Reviewed-on: #261
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-09 20:48:41 +00:00
e2ea310fe9 removed contribution frequency from form 2021-11-07 21:32:06 +01:00
40267a87eb Merge pull request 'Perks: Spanish translation' (#259) from perks_sp into master
Reviewed-on: #259
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-11-05 01:16:23 +00:00
7722a137f9 Merge branch 'perks_sp' of https://git.disroot.org/Disroot/Website into perks_sp 2021-11-04 22:15:41 -03:00
591bc1f7c3 Perks: Spanish translation 2021-11-04 22:15:04 -03:00
027c662d6e Merge pull request 'Fix typo on French translation' (#260) from meaz-patch-1 into master
Reviewed-on: #260
2021-11-04 09:03:06 +00:00
f0f16eb0a0 Fix typo on French translation 2021-11-04 09:02:46 +00:00
1ffe242805 Merge branch 'master' into perks_sp 2021-11-04 08:47:57 +00:00
bab54463af French translation of Perks page (#258)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #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
55df644a11 Perks: Spanish translation 2021-11-03 13:09:26 -03:00
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
b65f0af795 small edits 2021-11-02 15:50:03 +01:00
6b760a52ea Merge branch 'master' into customdomainchanges 2021-11-02 09:59:40 +00:00
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: #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
ec48b98601 Merge pull request 'overview_sep_2021' (#257) from overview_sep_2021 into master
Reviewed-on: #257
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-10-31 12:28:35 +00:00
f8391417cc Update Contact page in other languages (#256)
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: #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
0f824428c7 improve image 2021-10-28 16:55:01 +02:00
876e482434 correct image 2021-10-28 16:52:33 +02:00
4dc3556eb8 monthly overview September 2021 2021-10-28 16:48:52 +02:00
c411a7a1f7 Merge pull request 'WEBSITE_SP_UPDATE' (#255) from WEBSITE_SP_UPDATE into master
Reviewed-on: #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
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: #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
3659cac6ca Website's spanish translation update 2021-10-05 01:01:38 -03:00
87622a15cd Website's spanish translation update 2021-10-05 00:30:54 -03:00
4f80ea3b48
typo 2021-10-01 14:13:01 +02:00
b1f4baacde
add missing quotes 2021-10-01 14:12:14 +02:00
412062ee1c
French translation 2021-10-01 14:11:04 +02:00
0572659f9b
custom domain - form and service-email page changes 2021-10-01 11:37:25 +02:00
15d2ab205a update cryptpad with new icons + form (#252)
Fix [#251](#251)

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #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
2b8d27ba47 Merge pull request 'Monthly overview july, august 2021' (#250) from overview_jul_aug_2021 into master
Reviewed-on: #250
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-09-08 18:10:33 +00:00
5b7239514e some errors in spreadsheet corrected 2021-09-06 11:03:47 +02:00
6383bc79fc updated patreon's total donations 2021-09-06 10:25:42 +02:00
3f827420ca Monthly overview july, august 2021 2021-09-03 12:51:41 +02:00
7ad7ff0225 Merge pull request 'add nocache to img link' (#249) from greenweb into master
Reviewed-on: #249
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-08-18 07:03:10 +00:00
2998cc2414
add nocache to img link 2021-08-10 09:22:05 +02:00
912d1b1779 Merge pull request 'overview_june_2021' (#246) from overview_june_2021 into master
Reviewed-on: #246
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-07-29 10:07:58 +00:00
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
30abe07f10 unlock goal 3 volunteers 2021-07-29 09:08:03 +02:00