aboutsummaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * more minor wordsmithingfriendica2014-11-121-2/+2
| | * Some dates couldn't be verified without going way back in the archives so at ...friendica2014-11-121-3/+3
| | * add history linkfriendica2014-11-121-0/+1
| | * History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff.friendica2014-11-121-0/+48
| | * Document reinstalling, or saying don't do that without explicitly stating don...Thomas Willingham2014-11-081-2/+10
| | * update to German help fileszottel2014-11-072-3/+4
| | * doc updatesfriendica2014-11-07102-406/+1576
| * | PostgreSQL support initial commitHabeas Codice2014-11-132-0/+90
| |/
| * doc updatesfriendica2014-11-0110-0/+1049
| * doc updatesfriendica2014-10-3182-1814/+1782
| * Debian doco - no longer uses dropbear.Thomas Willingham2014-10-311-2/+2
* | Merge remote branch 'upstream/master'habeascodice2014-10-29255-1924/+6784
|\|
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-273-12/+14
| |\
| | * Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-272-0/+60
| | |\
| | * | update nl + Terms of Service more prominent in the help files.Jeroen2014-10-273-12/+14
| * | | add "repository" permissions role and make sure we have a sane "accept" defau...friendica2014-10-271-3/+12
| | |/ | |/|
| * | some documentation of permission roles and what the differences are.friendica2014-10-272-0/+60
| |/
| * the to-do list is getting longer again.friendica2014-10-241-0/+3