Commit graph

504 commits

Author SHA1 Message Date
muppeth 01541f1b8c Merge branch 'newDeleteAccount' into 'master'
new delet account pages

See merge request disroot/howto!75
2018-10-26 13:53:26 +02:00
antil0pa 71a56995e8 Merge branch 'pt' into 'master'
Forgot to translate this page :x

See merge request disroot/howto!74
2018-10-24 22:51:13 +02:00
antil0pa efa7d50030 Merge branch 'patch-3' into 'master'
Update docs.pt.md

See merge request disroot/howto!73
2018-10-24 22:50:47 +02:00
antil0pa 6c6862fc81 new delet account pages 2018-10-24 22:36:54 +02:00
maryjane 16619102cb Forgot to translate this page :x 2018-10-16 13:27:30 +02:00
maryjane 29f33eb902 Update docs.pt.md 2018-10-01 12:34:29 +02:00
muppeth 0d4bc7a3ea Merge branch 'iOS_contacts' into 'master'
Added iOS contacts syncing instructions

See merge request disroot/howto!71
2018-09-15 22:17:16 +02:00
muppeth f2249081fd Merge branch 'pt-translation-v3' into 'master'
translation v3 - Dishub

See merge request disroot/howto!70
2018-09-15 22:14:29 +02:00
muppeth 296a7f997d Merge branch 'ChatSecure' into 'master'
Added guide for xmpp with ChatSecure on iOS

See merge request disroot/howto!72
2018-09-15 22:13:28 +02:00
maryjane 6904af8db5 fixed typo in URL 2018-09-15 21:34:42 +02:00
J.T. Revner 63aa90229e Added guide for xmpp with ChatSecure on iOS 2018-08-21 20:58:50 -04:00
J.T. Revner e5f4929a67 Added iOS contacts syncing instructions 2018-08-21 20:21:43 -04:00
maryjane fabfc055fb Just changed the beggining of a sentance 2018-08-21 20:09:28 +02:00
maryjane 3485293979 typo fix 2018-08-21 20:09:23 +02:00
maryjane 047c16ed0d finished the commit :) 2018-08-21 20:09:14 +02:00
maryjane bd1657efad Typo fixing and added "Hubzilla Network" in the part "anybody at this network" 2018-08-21 20:09:08 +02:00
maryjane dbe5f46939 Typo fixing and added "Hubzilla Network" in the part "anybody at this network" 2018-08-21 20:09:01 +02:00
maryjane 8b32a74ece Changed the paragraph about Connecting to other networks, added mention of Pleroma and Peertube. 2018-08-21 20:08:56 +02:00
maryjane 3e2b999acc Small typos and added some words to male things more clear 2018-08-21 20:08:45 +02:00
maryjane 7f2413e855 small changes to English 2018-08-21 20:08:28 +02:00
muppeth 21318ce703 Merge branch 'FAQ' into 'master'
Creation of a FAQ for dishub

See merge request disroot/howto!69
2018-08-20 17:20:11 +02:00
meaz d8ac4d4a86 Creation of a FAQ for dishub 2018-08-20 17:17:07 +02:00
muppeth 9a5e9a073b Merge branch 'spellingandgrammar' into 'master'
Spelling and grammar fixes

See merge request disroot/howto!67
2018-08-20 11:13:32 +02:00
muppeth 99815422bb Merge branch 'master' into 'spellingandgrammar'
# Conflicts:
#   pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/docs.en.md
2018-08-20 11:12:56 +02:00
muppeth 3263198237 Merge branch 'ios_calendar_french' into 'master'
Nextcloud - Ios calendar into French

See merge request disroot/howto!68
2018-08-20 11:10:26 +02:00
meaz 0f7c2fc087 small typo on of nextcloud ios calendar setting English page 2018-08-20 10:34:00 +02:00
meaz cd5e633e97 French translation of nextcloud ios calendar setting 2018-08-20 10:33:40 +02:00
J.T. Revner 55d23994bc Spelling and grammar fixes 2018-08-19 21:30:32 -04:00
muppeth 223c862b97 Merge branch 'ioS_calendar' into 'master'
Io s calendar

See merge request disroot/howto!66
2018-08-18 08:08:09 +02:00
J.T. Revner 94def98fb5 Updated CHANGE.LOG 2018-08-15 20:26:53 -04:00
J.T. Revner ba023ef625 Added documentaion for syncing Disroot calendar with iOS Calendar and Reminder apps. 2018-08-15 20:21:37 -04:00
muppeth 865b6e9aa7 Merge branch 'dishub_updates' into 'master'
Dishub updates

See merge request disroot/howto!64
2018-08-09 09:54:53 +02:00
muppeth 7ab9f305c8 Merge branch 'spanish-translation' into 'master'
Spanish translation

See merge request disroot/howto!61
2018-08-09 09:54:09 +02:00
meaz f577be3dc1 Mentions: no more numbers + how to mention someone on mastodon 2018-08-09 09:26:08 +02:00
meaz 8daf5a6baa Change the way to connect to other protocols like mastodon. 2018-08-09 09:20:17 +02:00
antil0pa f1333bec5f Merge branch 'linksfix2' into 'master'
forgot to change all links to lower case

See merge request disroot/howto!63
2018-08-07 22:11:59 +02:00
antil0pa 7e1282d34d forgot to change all links to lower case 2018-08-07 22:10:59 +02:00
antil0pa ee2fb6eff8 Merge branch 'linksfix' into 'master'
fixed faulty links

See merge request disroot/howto!62
2018-08-07 22:07:36 +02:00
antil0pa c8dcc83734 fixed faulty links 2018-08-07 22:05:41 +02:00
Daniel Capilla bfae32749e Spelling 2018-08-02 15:23:18 +02:00
Daniel Capilla ce326d9f0c Spelling and title translation 2018-08-02 15:20:40 +02:00
muppeth b784d8e49c Merge branch 'spanish-translation' into 'master'
Section '06. Pads and Bins' translated into Spanish

See merge request disroot/howto!60
2018-08-02 14:23:27 +02:00
Daniel Capilla bcb05f1347 Section '06. Pads and Bins' translated into Spanish 2018-07-29 15:19:39 +02:00
muppeth 6b15b89ada Merge branch 'dishub_basics' into 'master'
Rewrite of the basics part (dishub howto)

See merge request disroot/howto!57
2018-07-25 10:25:31 +02:00
muppeth 19fe117d25 Merge branch 'spanish-translation' into 'master'
Added Spanish translation

See merge request disroot/howto!54
2018-07-23 13:24:08 +02:00
muppeth e61f46a376 Merge branch 'gajim2' into 'master'
Gajim2

See merge request disroot/howto!59
2018-07-17 15:16:37 +02:00
meaz 9efd4535b9 New commit for gajim on the right branch :) 2018-07-11 14:05:19 +02:00
meaz a4e676c5bf Rewrite of the basics part (dishub howto) 2018-07-10 14:47:35 +02:00
Daniel Capilla ca46cb8b49 Fix orthography 2018-07-09 22:13:44 +02:00
Daniel Capilla 0895f1660b Spelling 2018-07-09 22:10:58 +02:00