aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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...
| | * Changed CSS class "selected" to "active" in navbar, according to ↵Olivier Migeot2013-09-182-8/+8
| | | | | | | | | | | | https://abcentric.net/display/f17b319c6d4b616a0d0a639e177969c6ae084248f1ee2bec9d8147c9291bf495@abcentric.net
| * | Merge pull request #138 from pixelroot/masterfriendica2013-09-181-406/+468
| |\ \ | | |/ | |/| modified: view/ru/messages.po
| | * modified: view/ru/messages.popixelroot2013-09-161-406/+468
| | |
* | | make collections work againfriendica2013-09-182-5/+10
|/ /
* | fix sql for directory tagcloudfriendica2013-09-171-1/+1
| |
* | provide the back-end for a directory tag cloudfriendica2013-09-172-1/+69
| |
* | site sellpage linksfriendica2013-09-177-9/+24
| |
* | Pieces we'll need to tie together chanman and account/channel deletion and ↵friendica2013-09-176-21/+89
| | | | | | | | | | | | | | | | directory sync. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. OK? Understood?
* | Didn't git add again after fixing typo...Thomas Willingham2013-09-181-1/+1
| |
* | Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put ↵Thomas Willingham2013-09-183-0/+23
| | | | | | | | content wrapper back now JS is fixed for features page.
* | missing verb on items linked to photosfriendica2013-09-171-1/+1
| |
* | sync photo permissions with the attached item whenever they change.friendica2013-09-172-2/+20
| |
* | bumped the capslockfriendica2013-09-171-1/+1
| |
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-174-3/+20
|\ \
| * \ Merge pull request #142 from dsp1986/masterfriendica2013-09-172-3/+3
| |\ \ | | | | | | | | | | | | | | | | Thanks! fix include paths
| | * | fix include pathsdsp19862013-09-172-3/+3
| | | |
| * | | Merge pull request #141 from MicMee/masterfriendica2013-09-172-0/+17
| |\ \ \ | | | | | | | | | | Preparation for server / hubloc handling
| | * | | removed logger statementMichael Meer2013-09-171-1/+0
| | | | |
| | * | | extend admin page for hubloc / server key managementMichael Meer2013-09-173-0/+18
| | | | |
* | | | | SEO: add keywords to appropriate channel pagesfriendica2013-09-171-0/+7
|/ / / /
* / / / add -C cfgfile option to shred to allow multiple configurations. I just ↵friendica2013-09-173-2/+9
|/ / / | | | | | | | | | added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all.
* | | assuming permissions are correct, unobscure photo comments. Should probably ↵friendica2013-09-161-1/+2
| | | | | | | | | | | | make sure permissions are correct and figure out why some photo comments on public photos are getting stored with privacy. This probably requires that whenever we change photo permissions for linked photos/items we change the item permissions to match. They might be out of sync.
* | | more work on viewing obscured api postsfriendica2013-09-162-10/+17
| | |
* | | use prepare_body in api calls to properly render content, add 'mode' to ↵friendica2013-09-164-8/+13
| | | | | | | | | | | | conversation templates so that themes can use the module context to suppress or show comments as desired
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-161-1/+1
|\ \ \
| * \ \ Merge pull request #139 from tazmandevil/masterThomas Willingham2013-09-161-1/+1
| |\ \ \ | | | | | | | | | | fixed link to wiki
| | * | | fixed link to wikiTazman DeVille2013-09-171-1/+1
| |/ / /
* / / / several oauth fixes - shred doesn't completely work yet, but it also doesn't ↵friendica2013-09-168-39/+781
|/ / / | | | | | | | | | completely NOT work, so at least there's some improvement
* | | found itfriendica2013-09-151-3/+3
| | |
* | | spurious blank linesfriendica2013-09-153-3/+0
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-151-3/+0
|\ \ \
| * | | Content wrapper breaks feature settings. Get rid of it as a quick fix until ↵Thomas Willingham2013-09-161-3/+0
| | | | | | | | | | | | | | | | I get a chance to work out why it works everywhere except there.