Disroot/Website
Disroot
/
Website
14
15
Fork 14
Code Pull Requests 3 Releases Activity
1,895 Commits 18 Branches 0 Tags 198 MiB
Commit Graph

1895 Commits

Author SHA1 Message Date
muppeth 0ea1ccf505
custom domain form and changes on the mail service page 2021-10-01 11:26:56 +02:00
muppeth 0e00044d30 tttt 2021-09-30 11:27:58 +02:00
meaz 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
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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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