Commit Graph

806 Commits

Author SHA1 Message Date
muppeth af68eb5fe6 Vagrant 2019-01-07 18:31:40 +01:00
muppeth b10ff4590f Merge branch 'spanish_03' into 'master'
Spanish 03 translate

See merge request disroot/howto!95
2019-01-02 22:32:36 +01:00
abdhessuk 073dadc931 Spanish 03 translate 2019-01-02 22:32:36 +01:00
muppeth 4949575347 Merge branch 'gdpr_es_fixes' into 'master'
GDPR_es_fixes

See merge request disroot/howto!93
2018-12-27 23:34:30 +01:00
Fede.- 1164719981 GDPR_es_fixes 2018-12-27 23:34:29 +01:00
muppeth 6932f7e42a Merge branch 'dino_how2' into 'master'
Dino how2

See merge request disroot/howto!92
2018-12-25 21:40:16 +01:00
Fede.- 992381d607 Update docs.es.md 2018-12-25 21:30:20 +01:00
Fede.- 37610b6c15 Update pages/05.XMPP/01.Desktop/03.dino/docs.en.md, pages/05.XMPP/01.Desktop/03.dino/docs.es.md files 2018-12-25 21:18:55 +01:00
Fede.- 8c0d4c979c Update pages/05.XMPP/01.Desktop/03.dino/es/01.png, pages/05.XMPP/01.Desktop/03.dino/es/02.png, pages/05.XMPP/01.Desktop/03.dino/es/03.png, pages/05.XMPP/01.Desktop/03.dino/es/04.png, pages/05.XMPP/01.Desktop/03.dino/es/05.png, pages/05.XMPP/01.Desktop/03.dino/es/05a.png, pages/05.XMPP/01.Desktop/03.dino/es/06.png, pages/05.XMPP/01.Desktop/03.dino/es/07.png, pages/05.XMPP/01.Desktop/03.dino/es/08.png, pages/05.XMPP/01.Desktop/03.dino/es/09.png, pages/05.XMPP/01.Desktop/03.dino/es/10.png, pages/05.XMPP/01.Desktop/03.dino/es/11.png, pages/05.XMPP/01.Desktop/03.dino/es/12.png, pages/05.XMPP/01.Desktop/03.dino/es/13.png, pages/05.XMPP/01.Desktop/03.dino/es/14.png, pages/05.XMPP/01.Desktop/03.dino/es/dino.svg files 2018-12-25 21:17:52 +01:00
Fede.- a0445e7c44 Update pages/05.XMPP/01.Desktop/03.dino/en/dino.svg, pages/05.XMPP/01.Desktop/03.dino/en/05.png, 06.png, pages/05.XMPP/01.Desktop/03.dino/en/06.png, pages/05.XMPP/01.Desktop/03.dino/en/07.png, pages/05.XMPP/01.Desktop/03.dino/en/07a.png, pages/05.XMPP/01.Desktop/03.dino/en/08.png, pages/05.XMPP/01.Desktop/03.dino/en/09.png, pages/05.XMPP/01.Desktop/03.dino/en/10.png, pages/05.XMPP/01.Desktop/03.dino/en/11.png, pages/05.XMPP/01.Desktop/03.dino/en/12.png, pages/05.XMPP/01.Desktop/03.dino/en/13.png, pages/05.XMPP/01.Desktop/03.dino/en/14.png, pages/05.XMPP/01.Desktop/03.dino/en/15.png files 2018-12-25 21:15:19 +01:00
Fede.- 31bcf97022 Subir nuevo archivo 2018-12-25 21:07:40 +01:00
Fede.- c4a6194925 Subir nuevo archivo 2018-12-25 21:06:03 +01:00
Fede.- 0fb5793b3a Subir nuevo archivo 2018-12-25 21:04:46 +01:00
Fede.- c964a03f65 Subir nuevo archivo 2018-12-25 21:04:05 +01:00
Fede.- 1bde51e42a Agregar nuevo directorio 2018-12-25 21:02:33 +01:00
Fede.- b82e70e6fa Agregar nuevo directorio 2018-12-25 21:01:46 +01:00
muppeth 47a1ff4992 Merge branch 'gpdr_pt' into 'master'
Added portuguese translation to GDPR chapter

See merge request disroot/howto!90
2018-12-24 12:51:31 +01:00
muppeth 59e9ca12e3 Merge branch 'second-factor' into 'master'
updated security part and added description of OTP, fixed personal.gif reference

See merge request disroot/howto!91
2018-12-24 12:50:36 +01:00
Maryjane a51f8ddeb6 Added portuguese translation to GDPR chapter 2018-12-21 03:38:04 +01:00
neelusR 99471d29f7 updated security part and added description of OTP, fixed personal.gif reference 2018-12-20 12:29:22 +01:00
muppeth e1b2e6dd30 Merge branch 'gdpr_es' into 'master'
Gdpr_es

See merge request disroot/howto!89
2018-12-20 10:58:13 +01:00
Fede.- 2957374417 Gdpr_es 2018-12-20 10:58:13 +01:00
antil0pa 42a2a043df Merge branch 'export_taiga_project' into 'master'
export information for Taiga
2018-12-17 21:45:01 +01:00
antil0pa 13364acfde Pictures fixed 2018-12-17 21:42:04 +01:00
antil0pa 8d2fd27a93 export information for Taiga 2018-12-17 21:36:56 +01:00
muppeth eb7affaf4a Merge branch 'gdpr_fixes' into 'master'
gdpr - quick text fix.

See merge request disroot/howto!87
2018-12-17 21:25:06 +01:00
Muppeth 1374beb203 gdpr - quick text fix. 2018-12-17 21:19:49 +01:00
muppeth caa25902b5 Merge branch 'gdpr_fixes' into 'master'
toc fix

See merge request disroot/howto!86
2018-12-17 21:19:47 +01:00
muppeth 3e1e9cb16a Merge branch 'gdpr_fixes' into 'master'
GDPR fixes and introduction

See merge request disroot/howto!85
2018-12-17 21:17:46 +01:00
Muppeth df41869407 toc fix 2018-12-17 21:16:20 +01:00
Muppeth b90d02f791 GDPR fixes and introduction 2018-12-17 21:13:36 +01:00
muppeth d1ab9d3f58 Merge branch 'MJ' into 'master'
Howto export data Discourse

See merge request disroot/howto!78
2018-12-17 21:08:21 +01:00
muppeth 6881ac8bc7 Merge branch 'gdpr-diaspora' into 'master'
Gdpr diaspora

See merge request disroot/howto!79
2018-12-17 21:08:09 +01:00
muppeth 6fd8987f58 Gdpr diaspora 2018-12-17 21:08:09 +01:00
muppeth 460ac25f61 Merge branch 'gdpr-bookmarks' into 'master'
Gdpr bookmarks

See merge request disroot/howto!80
2018-12-17 21:07:55 +01:00
muppeth e4df427358 Gdpr bookmarks 2018-12-17 21:07:55 +01:00
muppeth 8e87a42aa1 Merge branch 'gdpr-hubzilla' into 'master'
gdpr - hubzilla

See merge request disroot/howto!81
2018-12-17 21:07:40 +01:00
muppeth dd7535d6d4 Merge branch 'gdpr_nextcloud_contacts' into 'master'
Gdpr nextcloud contacts

See merge request disroot/howto!82
2018-12-17 21:07:23 +01:00
muppeth b3e9067942 Gdpr nextcloud contacts 2018-12-17 21:07:23 +01:00
muppeth f637743219 Merge branch 'gdpr-nextcloud-news' into 'master'
Gdpr nextcloud news

See merge request disroot/howto!83
2018-12-17 21:06:45 +01:00
muppeth fc3d0f36fd Gdpr nextcloud news 2018-12-17 21:06:45 +01:00
muppeth e70582d59e Merge branch 'gdpr-nextcloud-calendar' into 'master'
Gdpr nextcloud calendar

See merge request disroot/howto!84
2018-12-17 21:05:48 +01:00
muppeth 67a1ccf3e4 Gdpr nextcloud calendar 2018-12-17 21:05:48 +01:00
Muppeth 876ca991ae gdpr - hubzilla 2018-12-17 15:58:15 +01:00
Maryjane 7f40eeec94 Howto export data Discourse 2018-12-17 02:46:12 +01:00
Muppeth e9118d82f6 setting up directory structure for gdpr howtos 2018-12-16 23:11:57 +01:00
Muppeth 859e05f21b preparing gdpr directory structure 2018-12-16 23:00:43 +01:00
muppeth a3832c8c93 Merge branch 'patch-4' into 'master'
Update docs.it.md

See merge request disroot/howto!76
2018-12-02 13:10:01 +01:00
muppeth 4a70bf60db Merge branch 'DisHub' into 'master'
Dis hub

See merge request disroot/howto!77
2018-12-02 13:09:11 +01:00
maryjane f41f0f863e removed an extra picture 2018-11-29 02:16:28 +01:00