aboutsummaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #749 from pafcu/hijackingdocfixRedMatrix2014-12-211-1/+1
|\ \
| * | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct)Stefan Parviainen2014-12-201-1/+1
* | | Oopsie in GermanThomas Willingham2014-12-201-1/+1
* | | Doco - fix some tags.Thomas Willingham2014-12-205-9/+12
|/ /
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-2068-691/+1199
|\ \
| * | doc updatesfriendica2014-12-1968-691/+1199
* | | More FAQThomas Willingham2014-12-201-0/+10
|/ /
* | My links are also out of date.Thomas Willingham2014-12-181-3/+3
* | deleted a dead linkOliver2014-12-181-1/+0
* | This needs a lot more cleanup but at least it's a bit more complete now.friendica2014-12-171-16/+101
* | minor clarifications on a few settingsfriendica2014-12-171-9/+10
* | Doco - another handful of configsThomas Willingham2014-12-171-0/+13
* | Minor docoThomas Willingham2014-12-161-1/+6
* | Merge pull request #746 from pafcu/autofollowdocThomas Willingham2014-12-151-1/+4
|\ \
| * | Document the auto_follow optionStefan Parviainen2014-12-151-1/+4
* | | Doco: How to write foreign doco in how to write doco doco.Thomas Willingham2014-12-151-0/+8
|/ /
* | doc updatefriendica2014-12-125-0/+721
* | don't import to sys channel from self-censored authorsfriendica2014-12-1280-771/+991
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1029-160/+65
|\ \
| * | Issue #732Thomas Willingham2014-12-092-2/+28
| * | Merge pull request #731 from zzottel/masterzzottel2014-12-0823-28/+31
| |\ \
| | * | add main_footer include to all .md files except TOS and READMEzottel2014-12-0823-28/+31
| * | | mergeChristian Vogeley2014-12-071-4/+4
| * | | mergeChristian Vogeley2014-12-073-126/+2
| |/ /
* / / block adult channels from inclusion in public content feedsfriendica2014-12-102-2/+2
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-281-18/+18
|\ \
| * | Doco - #710 flipped the colours. Unsurprisingly, they were the otherThomas Willingham2014-11-281-18/+18
* | | doc updatesfriendica2014-11-2857-155/+564
|/ /
* | Documentation wordingAndrew Manning2014-11-253-132/+8
* | update to Germanmain help filezottel2014-11-241-0/+2
* | more roadmapfriendica2014-11-231-0/+3
* | project roadmapfriendica2014-11-232-0/+47
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-221-0/+2
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-211-0/+7
| |\ \
| * | | new system config reserved_channelsHabeas Codice2014-11-211-0/+2
* | | | random block widgetfriendica2014-11-221-0/+7
* | | | doc updatesfriendica2014-11-2291-1408/+1554
| |/ / |/| |
* | | random photo widgetfriendica2014-11-201-0/+7
|/ /
* | to-do updatefriendica2014-11-201-0/+1
* | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-181-0/+6
|\ \
| * | forgot to add catcloud to the widget docfriendica2014-11-171-0/+6
* | | update docsHabeas Codice2014-11-181-2/+2
* | | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-17152-1591/+3305
|\| |
| * | doc updatesfriendica2014-11-15152-1591/+3305
* | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-11-13159-2008/+4345
|\| |
| * | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-13107-411/+1641
| |\ \
| | * | make it a bit personalfriendica2014-11-121-3/+3
| | * | ok, I think I'll give it a break now.friendica2014-11-121-6/+8
| | * | minor word tweaksfriendica2014-11-121-3/+3
| | * | wordsmithfriendica2014-11-121-1/+1