Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-26 | 3 | -2/+31 |
|\ | |||||
| * | Actually, lets add a content wrapper while we're in there. | Thomas Willingham | 2013-09-27 | 1 | -0/+2 |
| | | |||||
| * | Typo | Thomas Willingham | 2013-09-27 | 1 | -1/+1 |
| | | |||||
| * | Issue #131 | Thomas Willingham | 2013-09-27 | 2 | -2/+11 |
| | | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2013-09-27 | 8 | -11/+39 |
| |\ | |||||
| * | | Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty ↵ | Thomas Willingham | 2013-09-27 | 2 | -1/+19 |
| | | | | | | | | | | | | center tag, and stop very long tags overlapping the directory. | ||||
* | | | aggregate channels | friendica | 2013-09-26 | 1 | -26/+86 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-26 | 2 | -2/+6 |
|\ \ | |||||
| * \ | Merge pull request #155 from oohlaf/fixes | Olaf Conradi | 2013-09-26 | 1 | -1/+5 |
| |\ \ | | |/ | |/| | Explain why public comments are disabled and what needs to happen to enable them. | ||||
| | * | Add explanation why public comments are disabled. | Olaf Conradi | 2013-09-26 | 1 | -1/+5 |
| | | | |||||
| * | | Typo | Thomas Willingham | 2013-09-26 | 1 | -1/+1 |
| | | | |||||
* | | | structure for channel unions | friendica | 2013-09-26 | 7 | -10/+34 |
|/ / | |||||
* / | suppress creating the directory update record for profile updates which are ↵ | friendica | 2013-09-25 | 6 | -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 table | friendica | 2013-09-24 | 1 | -9/+17 |
| | |||||
* | don't send email notifications for likes (as comment notifications). We'll ↵ | friendica | 2013-09-24 | 1 | -1/+6 |
| | | | | need a separate preference for whether you want notifications for likes. | ||||
* | add some text for issue #79 | friendica | 2013-09-24 | 1 | -0/+7 |
| | |||||
* | Merge pull request #154 from oohlaf/fixes | Olaf Conradi | 2013-09-24 | 1 | -2/+2 |
|\ | | | | | Fix name of Bleichenbacher | ||||
| * | Fix name of Bleichenbacher | Olaf Conradi | 2013-09-24 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #153 from zzottel/master | zzottel | 2013-09-24 | 1 | -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. | zottel | 2013-09-24 | 1 | -2/+2 |
|/ | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-24 | 2 | -0/+42 |
|\ | |||||
| * | Merge pull request #152 from MicMee/master | friendica | 2013-09-24 | 2 | -0/+42 |
| |\ | | | | | | | Preparation for maintenance od hubloc/server | ||||
| | * | added new smarty template admin_hubloc.tpl | Michael Meer | 2013-09-24 | 1 | -0/+22 |
| | | | |||||
| | * | admin hubloc page now with content from all hublocs, in next steps I add ↵ | Michael Meer | 2013-09-24 | 1 | -0/+20 |
| |/ | | | | | | | some tests with zping and reduce the content to known problems. | ||||
* / | reduce susceptibility to bleichenberger attack | friendica | 2013-09-24 | 4 | -8/+21 |
|/ | |||||
* | spice this up a little bit... | friendica | 2013-09-23 | 1 | -0/+8 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-23 | 1 | -0/+20 |
|\ | |||||
| * | Merge pull request #151 from zzottel/master | friendica | 2013-09-23 | 1 | -0/+20 |
| |\ | | | | | | | add [observer] tags and [observer.baseurl] | ||||
| | * | add [observer] tags and [observer.baseurl] | zottel | 2013-09-23 | 1 | -0/+20 |
| |/ | |||||
* / | oauth settings - clarify text | friendica | 2013-09-23 | 2 | -7/+14 |
|/ | |||||
* | one more edge case in the public perms - don't match perms = 0 which is ↵ | friendica | 2013-09-22 | 3 | -6/+7 |
| | | | | private, this and prior checkin are for issue #114 | ||||
* | fixes for display and search privacy enforcement | friendica | 2013-09-22 | 3 | -36/+76 |
| | |||||
* | update ru strings | friendica | 2013-09-22 | 1 | -282/+365 |
| | |||||
* | bug #150, if deny access is present but nobody has been allowed, create an ↵ | friendica | 2013-09-22 | 1 | -1/+22 |
| | | | | allow list containing everybody in your address book. Then subtract those who are denied. | ||||
* | adult channel setting | friendica | 2013-09-22 | 7 | -14/+28 |
| | |||||
* | clean up app management a bit | friendica | 2013-09-20 | 2 | -5/+10 |
| | |||||
* | hopefully(?) the final word on remote comment permissions | friendica | 2013-09-20 | 2 | -3/+4 |
| | |||||
* | fix contact comment permissions | friendica | 2013-09-20 | 1 | -1/+6 |
| | |||||
* | missing uid check on comanche_block to ensure we get the block with that ↵ | friendica | 2013-09-20 | 1 | -1/+2 |
| | | | | name that we own | ||||
* | when it's a contentious issue, make it an option. | friendica | 2013-09-20 | 1 | -4/+8 |
| | |||||
* | OK, sure. | friendica | 2013-09-20 | 1 | -1/+1 |
| | |||||
* | hopefully this will go over a bit better - check post owner permissions as ↵ | friendica | 2013-09-20 | 3 | -3/+13 |
| | | | | well as local owner permissions for comments during submission, since the comment was being blindly accepted on the local system due to only checking the profile owner. Also change collections query to include only top-level posts by a member of the collection. | ||||
* | Merge pull request #148 from oohlaf/fixes | friendica | 2013-09-20 | 1 | -1/+2 |
|\ | | | | | Mark child posts as commentable when parent is set to commentable | ||||
| * | Mark child posts as commentable when parent is set to commentable | Olaf Conradi | 2013-09-20 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #147 from oohlaf/fixes | Olaf Conradi | 2013-09-20 | 1 | -1/+1 |
|\ | | | | | Enable likes again on posts | ||||
| * | Enable likes again on posts | Olaf Conradi | 2013-09-20 | 1 | -1/+1 |
|/ | |||||
* | is_commentable() had some major issues when applied to the atrocity known as ↵ | friendica | 2013-09-20 | 3 | -12/+30 |
| | | | | | | ConversationObject, hopefully this won't destabilise the network as it's a somewhat major permission tweak related to comments; also add any local clones to allowed_public_recips() as they should always be allowed recipients. Not sure what to do about host permissions in the event of clones. They have more than one host, and it isn't spelled out in the sent message. All of this stuff will make your head hurt. | ||||
* | rev update | friendica | 2013-09-20 | 2 | -1086/+1100 |
| | |||||
* | doc updates | friendica | 2013-09-20 | 80 | -1326/+1870 |
| | |||||
* | add a flag field to xtags so that we can filter tags based on whether or not ↵ | friendica | 2013-09-19 | 3 | -3/+12 |
| | | | | the parent xchan is safe or not. Otherwise we'll have tags that lead to nowhere because the directory entry is hidden but the tag isn't. A successful porn site in the matrix could also swamp the directory with x-rated tags, even if the site was playing nice and did everything right to self-censor. Accomplishing this with joins would be horrendously inefficient, though it will take a bit of code re-org to get this flag where it needs to be when it's time to set keywords. |