Commit Graph

1930 Commits

Author SHA1 Message Date
famubu 9dbc40cbf1 Fix tiny typo 2021-11-15 16:49:09 +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