aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| |\ \
| | * \ Upstream mergeChristian Vogeley2013-09-1592-2558/+3573
| | |\ \ | | |/ / | |/| |
| | * | Search by dateChristian Vogeley2013-09-152-12/+13
* | | | implement what I hope will now be the server side of directory sync, add view...friendica2013-09-154-18/+40
|/ / /
* | | fix the missing brace before pushingfriendica2013-09-141-2/+3
* | | some fixes to directory keyword searchesfriendica2013-09-142-3/+5
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-141-5/+6
|\ \ \
| * \ \ Merge pull request #135 from unary/menueditfriendica2013-09-141-5/+6
| |\ \ \
| | * | | set menu_channel_id before we use it in a queryMichael Johnston2013-09-141-3/+2
| | * | | let me edit menu_desc even if menu_name has not changedMichael Johnston2013-09-141-2/+4
* | | | | no longer usedfriendica2013-09-141-68/+0
|/ / / /
* | | | Merge https://github.com/friendica/red into zpullfriendica2013-09-141-1303/+1611
|\| | |
| * | | Merge pull request #132 from pixelroot/masterOlaf Conradi2013-09-141-1303/+1611
| |\ \ \
| | * | | modified: view/ru/messages.popixelroot2013-09-131-1303/+1611
| * | | | Revert broken commitOlaf Conradi2013-09-141-92/+2
| * | | | First try to tell a comment from a like/dislike in notification systemmrjive2013-09-141-2/+92
* | | | | this might fix "find channels" but I can't test the keyword search until this...friendica2013-09-142-2/+2
|/ / / /
* | | / import_xchan - check every known hubloc/location field and create a new hublo...friendica2013-09-142-5/+9
| |_|/ |/| |
* | | doc update, put more telemetry on notifier and try to ensure that private pos...friendica2013-09-1357-1065/+1586
* | | need to figure out what's causing thisfriendica2013-09-121-0/+6
* | | No point beating a dead horsefriendica2013-09-121-1/+8
* | | so public_recips and allowed_public_recips is working so much better than bef...friendica2013-09-121-4/+12
* | | more remote error reporting for zotfriendica2013-09-122-0/+12
* | | remove some debugging stuff now that the problem they were trying to locate d...friendica2013-09-122-6/+1
* | | Merge pull request #130 from ndurchx/patch-1friendica2013-09-121-1/+1
|\ \ \
| * | | Fixed error in SQL Statementndurchx2013-09-121-1/+1
|/ / /
* | | Merge pull request #129 from MicMee/masterfriendica2013-09-122-1/+8
|\ \ \