aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * set default charset of email_header_encode, add ud_flags to indicate which up...friendica2013-09-184-4/+14
* | sync item_search with yesterday's network fix for collections. Add ud_addr to...friendica2013-09-195-10/+26
* | set default charset of email_header_encode, add ud_flags to indicate which (d...friendica2013-09-184-4/+14
|/
* 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, according to https://abce...Olivier Migeot2013-09-182-8/+8
| * | Merge pull request #138 from pixelroot/masterfriendica2013-09-181-406/+468
| |\ \ | | |/ | |/|
| | * 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 di...friendica2013-09-176-21/+89
* | 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
* | 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
| |\ \
| | * | fix include pathsdsp19862013-09-172-3/+3
| * | | Merge pull request #141 from MicMee/masterfriendica2013-09-172-0/+17
| |\ \ \
| | * | | 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 added...friendica2013-09-173-2/+9
|/ / /
* | | assuming permissions are correct, unobscure photo comments. Should probably m...friendica2013-09-161-1/+2
* | | more work on viewing obscured api postsfriendica2013-09-162-10/+17
* | | use prepare_body in api calls to properly render content, add 'mode' to conve...friendica2013-09-164-8/+13
* | | 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 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
|/ / /
* | | 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
* | | | more loggingfriendica2013-09-151-0/+3
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-151-1/+2
|\ \ \
| * \ \ Merge pull request #137 from unary/fbrowserThomas Willingham2013-09-151-1/+2
| |\ \ \
| | * | | fix photo file browserMichael Johnston2013-09-151-1/+2
| |/ / /
* / / / don't create a directory sync notification (entry in the updates table) if th...friendica2013-09-151-17/+30
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-152-12/+13
|\ \ \
| * \ \ Merge pull request #136 from cvogeley/masterfriendica2013-09-142-12/+13
| |\ \ \