aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add kdevelop files to .gitignoreThomas Willingham2013-09-291-1/+4
|
* Missing includeThomas Willingham2013-09-291-1/+1
|
* TypoThomas Willingham2013-09-291-1/+1
|
* Issue #117Thomas Willingham2013-09-292-10/+18
|
* 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 themes
| | * 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 ↵friendica2013-09-261-1/+5
| | | | make with a link in it is going to match a test for zot.
* 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 ↵Thomas Willingham2013-09-272-1/+19
| | | | | | | | | | | | center tag, and stop very long tags overlapping the directory.
* | | 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
| |\ \ | | |/ | |/| Explain why public comments are disabled and what needs to happen to enable them.
| | * 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 ↵friendica2013-09-256-10/+24
|/ | | | part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing.
* 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 ↵friendica2013-09-241-1/+6
| | | | need a separate preference for whether you want notifications for likes.
* 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 Bleichenbacher
| * 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
| * 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
| |\ | | | | | | Preparation for maintenance od hubloc/server
| | * 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 ↵Michael Meer2013-09-241-0/+20
| |/ | | | | | | some tests with zping and reduce the content to known problems.
* / 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]
| | * 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 ↵friendica2013-09-223-6/+7
| | | | private, this and prior checkin are for issue #114
* 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 ↵friendica2013-09-221-1/+22
| | | | allow list containing everybody in your address book. Then subtract those who are denied.