Disroot/Website
Disroot
/
Website
14
15
Fork 14
Code Pull Requests 4 Releases Activity
1,878 Commits 19 Branches 0 Tags 198 MiB
Commit Graph

1878 Commits

Author SHA1 Message Date
meaz b329cb08ed
Add a script to deploy Website easily on Debian. 2021-07-16 11:08:04 +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
meaz 16f21a0faf Merge pull request 'fix display issue with title on about page in mobile view' (#221) from about_mobile into master 
Reviewed-on: #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: #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: #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: #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