acetone
/
Website
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
951 Commits 17 Branches 0 Tags 101 MiB
Commit Graph

951 Commits

Author SHA1 Message Date
antil0pa 8dcf44d0be Merge branch 'master' into 'mission-statement' 
# Conflicts:
#   pages/mission-statement/_practical/2col-right.en.md
 2019-06-21 10:50:13 +02:00
antil0pa 815fbe5bdc small text correction 2019-06-21 10:48:53 +02:00
antil0pa 58047cb607 Merge branch 'mission-statement' into 'master' 
Mission statement

See merge request disroot/website!91
 2019-06-21 10:47:05 +02:00
antil0pa f8c28f303a Mission statement 2019-06-21 10:47:04 +02:00
antil0pa 19d867fad9 Merge branch 'master' into 'mission-statement' 
# Conflicts:
#   pages/mission-statement/_practical/2col-right.en.md
#   pages/mission-statement/_title/2col-right.en.md
#   pages/mission-statement/_tldr/2col-right.en.md
 2019-06-21 10:46:24 +02:00
antil0pa d410e3ed56 corrected few typos and grammer 2019-06-21 10:43:44 +02:00
antil0pa 42fc990d26 Merge branch 'mission-statement' into 'master' 
Mission statement

See merge request disroot/website!90
 2019-06-21 10:28:02 +02:00
antil0pa 026ccaf514 Mission statement 2019-06-21 10:28:00 +02:00
antil0pa 0faf3915e0 remove unused images 2019-06-21 10:10:46 +02:00
antil0pa f8a0af6025 Publish mission statement page 2019-06-21 10:06:59 +02:00
antil0pa 082b5cef12 Merge branch 'missing-backgrounds-fix' into 'master' 
added background to headers

See merge request disroot/website!88
 2019-06-12 17:00:56 +02:00
antil0pa 0842ffaf6a added background to headers 2019-06-12 16:59:53 +02:00
antil0pa 467ee3f69c Merge branch 'xmpp-page-fixes' into 'master' 
text adjustments on XMPP page

See merge request disroot/website!87
 2019-06-12 16:24:31 +02:00
antil0pa ce4ae8b62a text adjustments on XMPP page 2019-06-12 16:02:19 +02:00
Fede.- 54b4f64c79 Merge branch 'sp_update' into 'master' 
Spanish translations and english fixes

See merge request disroot/website!86
 2019-06-12 16:01:08 +02:00
Fede.- d1aa742f35 Spanish translations and english fixes 2019-06-12 10:56:51 -03:00
muppeth bbc59fd0b1 Merge branch 'overview-june2' into 'master' 
Overview june2

See merge request disroot/website!85
 2019-06-11 16:44:08 +02:00
antil0pa bfa8d4196b fixed supporters 2019-06-11 16:41:41 +02:00
muppeth 71f4a6772c Merge branch 'overview-june' into 'master' 
Financial overview june

See merge request disroot/website!84
 2019-06-11 16:35:04 +02:00
antil0pa f821d4c37c Financial overview june 2019-06-11 16:31:00 +02:00
muppeth 3486f62cf1 Merge branch 'xmpp_page' into 'master' 
Xmpp page

See merge request disroot/website!83
 2019-06-11 16:20:50 +02:00
antil0pa 62ae3f26eb Xmpp page 2019-06-11 16:20:50 +02:00
Fede.- a31d41ab6e Translations / Broken link fixed 2019-06-10 22:59:33 +02:00
Fede.- db00a24dbd Broken link to H2 site fixed 2019-06-10 22:57:04 +02:00
muppeth f5cf863e25 blog - holidays nextcloud16 discover 2019-06-03 11:03:53 +02:00
Fede.- 3d05a07bc8 Fixed typo. 2019-05-19 15:09:25 +02:00
muppeth 9932169b20 donating to floss small changes to layout. 2019-05-03 13:55:21 +02:00
Fede.- 5314c2c4a0 Merge branch 'donating_floss' into 'master' 
Donations to FLOSS,and the end of internet'

See merge request disroot/website!82
 2019-05-03 13:37:54 +02:00
muppeth 8d78dad82c Donations to FLOSS,and the end of internet' 2019-05-03 13:33:04 +02:00
muppeth 432930f6e7 Merge branch 'it_update' into 'master' 
It update

See merge request disroot/website!81
 2019-05-01 20:59:19 +02:00
Massimiliano 79f4db54a1 It update 2019-05-01 20:59:19 +02:00
muppeth 9e8f51c0b2 Merge branch 'french2' into 'master' 
"Add storage to your mailbox" to French

See merge request disroot/website!79
 2019-05-01 20:54:22 +02:00
muppeth 40705bb28e Merge branch 'it_update' into 'master' 
Italian update of 01/05/2019

See merge request disroot/website!80
 2019-05-01 20:53:33 +02:00
Massimiliano cb26c98839 Italian update of 01/05/2019 2019-05-01 20:53:33 +02:00
meaz 9e02de4d8c "Add storage to your mailbox" to French 2019-05-01 17:51:50 +02:00
Fede.- bbe17ef7f3 Merge branch 'sp.website_02' into 'master' 
Spanish translations and fixes

See merge request disroot/website!78
 2019-05-01 16:00:34 +02:00
Fede.- 74516a534c Merge branch 'master' into 'sp.website_02' 
# Conflicts:
#   pages/03.services/02.email/_email-x-storage/2col-left.es.md
 2019-05-01 16:00:34 +02:00
Fede.- 1a53f0db58 _about doc fixed code 2019-05-01 15:33:15 +02:00
Fede.- 6b6b8e15b1 Merge branch 'sp.website_01' into 'master' 
Spanish translations and fixes

See merge request disroot/website!77
 2019-05-01 15:29:53 +02:00
Fede.- 8f58b56169 Spanish translations and fixes 2019-05-01 15:29:53 +02:00
antil0pa 8d9313248d Merge branch 'multiple_web_fixes' into 'master' 
re-order modular pages in other languages

See merge request disroot/website!76
 2019-05-01 12:18:58 +02:00
antil0pa e7fb1d1921 re-order mudular pages - spanish 2019-05-01 12:18:25 +02:00
antil0pa 90b45b241c re-order modular pages in other languages 2019-05-01 12:16:11 +02:00
antil0pa 33e0d64320 Merge branch 'multiple_web_fixes' into 'master' 
changed range field to number

See merge request disroot/website!75
 2019-05-01 10:44:39 +02:00
antil0pa a52ebd5cb3 changed range field to number 2019-05-01 10:43:55 +02:00
antil0pa 0b7b531b98 Merge branch 'multiple_web_fixes' into 'master' 
added x-storgae buttong to email service page and relevant form

See merge request disroot/website!74
 2019-05-01 10:24:58 +02:00
antil0pa 396717452d added x-storgae buttong to email service page and relevant form 2019-05-01 10:23:59 +02:00
muppeth 4e53069b96 fix broken link to howto 2019-04-26 21:03:02 +02:00
Fede.- 83078f27f5 Merge branch 'it_update' into 'master' 
Italian translation updates

See merge request disroot/website!73
 2019-04-21 19:33:01 +02:00
massimiliano 9366ddb870 Italian translation updates 2019-04-21 09:22:52 +02:00