aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
|
* missing uid check on comanche_block to ensure we get the block with that ↵friendica2013-09-201-1/+2
| | | | name that we own
* when it's a contentious issue, make it an option.friendica2013-09-201-4/+8
|
* OK, sure.friendica2013-09-201-1/+1
|
* hopefully this will go over a bit better - check post owner permissions as ↵friendica2013-09-203-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/fixesfriendica2013-09-201-1/+2
|\ | | | | Mark child posts as commentable when parent is set to commentable
| * Mark child posts as commentable when parent is set to commentableOlaf Conradi2013-09-201-1/+2
|/
* Merge pull request #147 from oohlaf/fixesOlaf Conradi2013-09-201-1/+1
|\ | | | | Enable likes again on posts
| * Enable likes again on postsOlaf Conradi2013-09-201-1/+1
|/
* is_commentable() had some major issues when applied to the atrocity known as ↵friendica2013-09-203-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 updatefriendica2013-09-202-1086/+1100
|
* doc updatesfriendica2013-09-2080-1326/+1870
|
* add a flag field to xtags so that we can filter tags based on whether or not ↵friendica2013-09-193-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.
* typofriendica2013-09-191-1/+1
|
* now bring it to the urlfriendica2013-09-191-0/+2
|
* bring safe mode to the client sidefriendica2013-09-191-1/+12
|
* use &safe=-1 for unsafe onlyfriendica2013-09-191-1/+4
|
* missing hashfriendica2013-09-192-2/+3
|
* Merge https://github.com/friendica/red into zpullfriendica2013-09-191-1/+4
|\
| * Use get_configThomas Willingham2013-09-201-1/+1
| |
| * Make $kw configurable.Thomas Willingham2013-09-201-1/+4
| |
* | provide a "safe search" backend and allow for self-censorship using nsfw or ↵friendica2013-09-194-3/+23
|/ | | | adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig.
* Merge https://github.com/friendica/red into zpullfriendica2013-09-191-1/+2
|\
| * Add tiered access option.Thomas Willingham2013-09-191-1/+2
| |
* | prefill private mail recip from $_REQUEST['to'] if it's there.friendica2013-09-191-0/+5
|/
* trim commas from keywordsfriendica2013-09-191-0/+1
|
* Merge branch 'zpull'friendica2013-09-191-0/+1
|\ | | | | | | | | | | | | Conflicts: boot.php install/database.sql install/update.php
| * set default charset of email_header_encode, add ud_flags to indicate which ↵friendica2013-09-184-4/+14
| | | | | | | | updates have been processed in some way.
* | sync item_search with yesterday's network fix for collections. Add ud_addr ↵friendica2013-09-195-10/+26
| | | | | | | | to update table to store the target address since it's possible the mirroring directory won't yet have an xchan or hubloc they can link the ud_hash to and therefore mayn't know how to contact them.
* | set default charset of email_header_encode, add ud_flags to indicate which ↵friendica2013-09-184-4/+14
|/ | | | (directory sync) updates have been processed in some way.
* add "tiered" access policy, add tagcloud to directory pagesfriendica2013-09-187-8/+29
|
* Merge https://github.com/friendica/red into zpullfriendica2013-09-183-414/+476
|\
| * Merge pull request #144 from omigeot/masterfriendica2013-09-182-8/+8
| |\ | | | | | | Changed CSS class "selected" to "active" in navbar...