aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-09-292-3/+2
|\
| * Prevent toolbar overlapping comanche nav links.Thomas Willingham2013-09-281-1/+0
| * Fix Comanche menusThomas Willingham2013-09-281-2/+2
* | Issue #158friendica2013-09-294-6/+13
|/
* close commentfriendica2013-09-282-1/+2
* Merge https://github.com/friendica/red into zpullfriendica2013-09-2833-0/+1400
|\
| * Merge pull request #157 from 0xAF/masterfriendica2013-09-2833-0/+1400
| |\
| | * Add colorpicker jquery plugin for themesStanislav Lechev [0xAF]2013-09-2833-0/+1400
| |/
* | fix can_comment_on_post when viewing wall-to-wallfriendica2013-09-284-15/+35
* | string updatefriendica2013-09-281-536/+589
* | doc updatesfriendica2013-09-2869-334/+587
|/
* convert to plaintext before matching words in body. Otherwise every post I ma...friendica2013-09-261-1/+5
* Merge https://github.com/friendica/red into zpullfriendica2013-09-263-2/+31
|\
| * Actually, lets add a content wrapper while we're in there.Thomas Willingham2013-09-271-0/+2
| * TypoThomas Willingham2013-09-271-1/+1
| * Issue #131Thomas Willingham2013-09-272-2/+11
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2013-09-278-11/+39
| |\
| * | Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty ce...Thomas Willingham2013-09-272-1/+19
* | | aggregate channelsfriendica2013-09-261-26/+86
| |/ |/|
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-262-2/+6
|\ \
| * \ Merge pull request #155 from oohlaf/fixesOlaf Conradi2013-09-261-1/+5
| |\ \ | | |/ | |/|
| | * Add explanation why public comments are disabled.Olaf Conradi2013-09-261-1/+5
| * | TypoThomas Willingham2013-09-261-1/+1
* | | structure for channel unionsfriendica2013-09-267-10/+34
|/ /
* / suppress creating the directory update record for profile updates which are p...friendica2013-09-256-10/+24
|/
* populate the new fields in the directory updates tablefriendica2013-09-241-9/+17
* don't send email notifications for likes (as comment notifications). We'll ne...friendica2013-09-241-1/+6
* add some text for issue #79friendica2013-09-241-0/+7
* Merge pull request #154 from oohlaf/fixesOlaf Conradi2013-09-241-2/+2
|\
| * Fix name of BleichenbacherOlaf Conradi2013-09-241-2/+2
|/
* Merge pull request #153 from zzottel/masterzzottel2013-09-241-2/+2
|\
| * Fix observer=1 tag. Using only observer without =1 won't work anymore now.zottel2013-09-241-2/+2
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-09-242-0/+42
|\
| * Merge pull request #152 from MicMee/masterfriendica2013-09-242-0/+42
| |\
| | * added new smarty template admin_hubloc.tplMichael Meer2013-09-241-0/+22
| | * admin hubloc page now with content from all hublocs, in next steps I add some...Michael Meer2013-09-241-0/+20
| |/
* / reduce susceptibility to bleichenberger attackfriendica2013-09-244-8/+21
|/
* spice this up a little bit...friendica2013-09-231-0/+8
* Merge https://github.com/friendica/red into zpullfriendica2013-09-231-0/+20
|\
| * Merge pull request #151 from zzottel/masterfriendica2013-09-231-0/+20
| |\
| | * add [observer] tags and [observer.baseurl]zottel2013-09-231-0/+20
| |/
* / oauth settings - clarify textfriendica2013-09-232-7/+14
|/
* one more edge case in the public perms - don't match perms = 0 which is priva...friendica2013-09-223-6/+7
* fixes for display and search privacy enforcementfriendica2013-09-223-36/+76
* update ru stringsfriendica2013-09-221-282/+365
* bug #150, if deny access is present but nobody has been allowed, create an al...friendica2013-09-221-1/+22
* adult channel settingfriendica2013-09-227-14/+28
* clean up app management a bitfriendica2013-09-202-5/+10
* hopefully(?) the final word on remote comment permissionsfriendica2013-09-202-3/+4
* fix contact comment permissionsfriendica2013-09-201-1/+6