wallun/disroot-website
1
0
Fork 0
forked from Disroot/Website
Code Issues Pull requests Projects Releases Wiki Activity
1081 commits 17 branches 0 tags 129 MiB
Commit graph

1081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fede.- 510247d91f Merge branch 'WEBSITE_services_NC_fix' into 'master' 
WEBSITE NC texts and links

See merge request disroot/website!145
 2019-09-06 05:45:45 +02:00
Fede.- 2bb309ed3c WEBSITE NC texts and links 2019-09-06 05:45:45 +02:00
Fede.- 516a03e057 Merge branch 'FAQ-IT' into 'master' 
Added FAQ pages - ITA

See merge request disroot/website!144
 2019-09-06 04:01:01 +02:00
l3o 401c3c3a0d Added FAQ pages - ITA 2019-09-06 04:01:01 +02:00
Fede.- 75939d8391 Merge branch 'WEBSITE_services_cloud_ger' into 'master' 
WEBSITE_services_cloud_ger

See merge request disroot/website!143
 2019-09-06 03:56:35 +02:00
shadowsword a6e09eec35 WEBSITE_services_cloud_ger 2019-09-06 03:56:35 +02:00
Fede.- 5ffe7e8177 Merge branch 'WEBSITE_home_ger' into 'master' 
WEBSITE_home_ger

See merge request disroot/website!142
 2019-09-06 03:51:52 +02:00
shadowsword 152d937f88 WEBSITE_home_ger 2019-09-06 03:51:52 +02:00
Fede.- 106854b3d9 Merge branch 'WEBSITE_services_pads_ger' into 'master' 
WEBSITE_services_pads_ger

See merge request disroot/website!141
 2019-09-06 03:46:04 +02:00
shadowsword 69c0a88325 WEBSITE_services_pads_ger 2019-09-06 03:46:04 +02:00
Fede.- da92fc0a9d Merge branch 'WEBSITE_services_bin_ger' into 'master' 
WEBSITE_services_bin_ger

See merge request disroot/website!140
 2019-09-06 03:41:31 +02:00
shadowsword aa53735898 services/privatebin translated 2 german 2019-09-05 22:25:12 +02:00
Fede.- 9c983bbc64 Merge branch 'community-fr-update' into 'master' 
Update community page in French

See merge request disroot/website!139
 2019-09-05 20:47:40 +02:00
meaz 4632d048f5 Update community page in French 2019-09-05 18:07:46 +02:00
antil0pa f8d9c8b6a7 Merge branch 'cherry-pick-52197022' into 'master' 
small improvments to mail storage form

See merge request disroot/website!138
 2019-09-05 13:47:55 +02:00
antil0pa ec8557147b small improvments to mail storage form 
(cherry picked from commit 5219702289f5b59db21b55c83e6c93b2a108b6f1)
 2019-09-05 13:47:55 +02:00
antil0pa a47f882c4f Merge branch 'fixing_various_issues' into 'master' 
fixes to various issues on website

See merge request disroot/website!137
 2019-09-05 12:50:21 +02:00
antil0pa 0e1650c033 - removed info about email alias - issue #2163 
- fixed buttons on forms - issue #2160
- corrected inconsistency in naming - issue #2039
 2019-09-05 12:50:21 +02:00
Fede.- 8f34f7e222 Merge branch 'WEBSITE_services_email_ger' into 'master' 
Website services email ger

See merge request disroot/website!135
 2019-09-05 04:29:38 +02:00
shadowsword 9917daa8e7 website services email translated to german 
minor corrections in english version
 2019-09-05 04:29:38 +02:00
Fede.- f0035b88ae Merge branch 'WEBSITE_services_xmpp_ger' into 'master' 
WEBSITE_services_xmpp_ger

See merge request disroot/website!136
 2019-09-05 04:03:48 +02:00
shadowsword f6df7e18fc XMPP translated to german 
some minor correction of english texts
 2019-09-05 04:03:48 +02:00
Fede.- a9511716b6 Merge branch 'WEBSITE_service_forum_ger' into 'master' 
WEBSITE_service_forum_ger

See merge request disroot/website!134
 2019-09-04 23:42:02 +02:00
shadowsword b7c6717b65 WEBSITE_service_forum_ger 2019-09-04 23:42:02 +02:00
Fede.- 86292bb04a Merge branch 'WEBSITE_services_social_ger' into 'master' 
WEBSITE_services_social_ger

See merge request disroot/website!133
 2019-09-04 23:38:20 +02:00
shadowsword bf3ccccdfb WEBSITE_services_social_ger 2019-09-04 23:38:20 +02:00
Fede.- e534e2d466 Merge branch 'WEBSITE_services_cloud_ger' into 'master' 
WEBSITE_services_cloud_ger

See merge request disroot/website!132
 2019-09-04 23:36:09 +02:00
shadowsword f8d0d277df service: cloud translated to german 
minor corrections in english docs
 2019-09-04 23:36:09 +02:00
Fede.- 6c22bdd81f Merge branch 'website_community-page_rev' into 'master' 
Website community page rev

See merge request disroot/website!129
 2019-09-04 23:32:19 +02:00
Fede.- c9290cd391 Website community page rev 2019-09-04 23:32:19 +02:00
muppeth c8620f1437 Merge branch 'website_blogpost_fixes' into 'master' 
Blogpost fixes

See merge request disroot/website!131
 2019-09-04 16:21:56 +02:00
Fede.- 8ce4a2e3c9 Fixed english and spanish version of the last blogpost, added images and fixed links to our translations state 2019-09-04 16:21:56 +02:00
muppeth f73631615c wrong link markdown formatting 2019-09-04 12:45:25 +02:00
muppeth 495875865c fixed issue 2019-09-04 12:43:07 +02:00
antil0pa 2f16fbb6e7 Merge branch 'back_to_work' into 'master' 
blog post - back to work

See merge request disroot/website!130
 2019-09-04 11:38:06 +02:00
muppeth ebaa27118c blog post - back to work 2019-09-04 11:38:05 +02:00
Fede.- 81f6ea89a0 Merge branch 'form_correction' into 'master' 
correction of the way to pay for extra storage (fr)

See merge request disroot/website!128
 2019-09-01 15:23:08 +02:00
Fede.- 3ba6abb537 Merge branch 'WEBSITE_home_ger' into 'master' 
WEBSITE_home_ger

See merge request disroot/website!127
 2019-09-01 15:21:09 +02:00
meaz bbf16a56ae correction of the way to pay for extra storage (fr) 2019-08-31 22:45:03 +02:00
shadowsword 251fbec273 corrections, optical improvements 2019-08-31 22:22:00 +02:00
Fede.- 19d5aaaf4d Merge branch 'WEBSITE_services_email_ger' into 'master' 
Website services email ger

See merge request disroot/website!126
 2019-08-31 00:12:21 +02:00
shadowsword 16c3ad4a81 website services email translated to german 
minor corrections in english version
 2019-08-31 00:12:21 +02:00
Fede.- 443348e477 Merge branch 'WEBSITE_home_ger' into 'master' 
WEBSITE_home_ger

See merge request disroot/website!125
 2019-08-30 05:49:31 +02:00
shadowsword 7e4b254413 WEBSITE_home_ger 2019-08-30 05:49:31 +02:00
Fede.- 15b0ca1aa1 Merge branch 'WEBSITE_aboutus_ger' into 'master' 
WEBSITE_aboutus_ger

See merge request disroot/website!124
 2019-08-30 05:47:10 +02:00
shadowsword f3c628b333 WEBSITE_aboutus_ger 2019-08-30 05:47:10 +02:00
Fede.- f8abad74e8 Merge branch 'website_forum_fr' into 'master' 
website forum french : french fix

See merge request disroot/website!123
 2019-08-30 05:43:27 +02:00
wisbit add35aabd3 website forum french : french fix 2019-08-30 05:43:27 +02:00
Fede.- 822e45316e Merge branch 'website_cloud_fr' into 'master' 
website french cloud - fix french

See merge request disroot/website!122
 2019-08-30 05:38:53 +02:00
wisbit 488fb3aa96 website french cloud section - fix french + added 2 files (text / deck) + fixed small typo in english file about the pads 2019-08-29 22:31:55 +02:00