some intial work on a splashier homepage
disable feature setting for collections and make feature settings for personal and new tab working.
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Revert "disable feature setting for collections and make feature settings for personal and new tab working."

This reverts commit ed00301bb641d716e43876572be640f8252b9b05.
Merge branch 'master' of https://github.com/friendica/red
add a temporary logger command at remote server side
Merge branch 'master' of https://github.com/friendica/red

to be in sync with main repro
to make visible what I try, ping still won't work, but I'm confused about get_channel
Merge branch 'master' of https://github.com/friendica/red

to be in sync with main repro
ping gives us now a reply. But the reply doesnt contains useful data, requires still some investigations
Doco - add KDE/Gnome/Davfs2 instructions
Don't look for emoticons inside the matching angle brackets of HTML tags (seriously)
add image floating to bbcode
Merge branch 'upstream'
oups
minor whitespace cleanup
Merge pull request #291 from toclimb/smilies-fix

Trying to make emoticons behave, 2nd round
Merge pull request #289 from beardy-unixer/master

Make Firefox behave if an attachment points to a file with a space in it...
Merge pull request #290 from git-marijus/master

add image floating to bbcode