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
a903cb436d
Merge branch 'master' into overview_june_2021
2021-07-28 09:44:57 +00:00
f9b25c7000
Merge pull request 'remove covid kit' ( #245 ) from kill_covid into master
...
Reviewed-on: #245
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-07-28 08:10:17 +00:00
aafc302cd6
better graph capture
2021-07-27 22:18:42 +02:00
12cd00ca7d
donation overview june 2021
2021-07-27 22:16:32 +02:00
c939ce8825
remove covid kit
2021-07-27 22:13:24 +02:00
6114824888
Merge pull request 'Add a script to deploy Website easily on Debian.' ( #244 ) from debian_script into master
...
Reviewed-on: #244
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-07-17 19:18:22 +00:00
427a1c5800
Merge branch 'master' of https://git.disroot.org/Disroot/Website into debian_script
2021-07-17 21:17:15 +02:00
e7ef74d4a8
Merge pull request 'vagrant_fix' ( #243 ) from vagrant_fix into master
...
Reviewed-on: #243
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2021-07-17 19:13:48 +00:00
b329cb08ed
Add a script to deploy Website easily on Debian.
2021-07-16 11:08:04 +02:00
29d3dc0046
fix more errors + update on vagrant and virtualbox
2021-07-16 10:27:31 +02:00
494235686c
Fix some errors with vagrant
2021-07-16 10:13:55 +02:00
1b958c5da6
Merge pull request 'remove matrix in FAQ' ( #242 ) from faq_matrix into master
...
Reviewed-on: #242
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-07-13 21:11:19 +00:00
4f79c42d04
remove matrix in FAQ
2021-07-13 22:15:51 +02:00
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: #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
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
28ad8e2593
Merge pull request 'overview update april ,may' ( #239 ) from overview_may_2021 into master
...
Reviewed-on: #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
5607daa442
Merge branch 'master' into overview_may_2021
2021-06-15 04:32:43 +00:00
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: #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
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: #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
ae6e0b4323
Merge pull request 'BLOG_Disnews_ES' ( #235 ) from BLOG_Disnews_ES into master
...
Reviewed-on: #235
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-06-02 16:27:46 +00:00
8dc9ffbd0a
DisNews-2 Spanish translation / Small fixes
2021-06-02 00:15:17 -03:00
ceee7da9fa
DisNews-2 Spanish Translation
2021-06-01 23:48:35 -03:00
2ea5dd1a0a
Merge pull request 'it-disnews-2' ( #234 ) from it-disnews-2 into master
...
Reviewed-on: #234
2021-06-01 12:19:55 +00:00
