aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | implement tip from Mike, corrected the sql statementMichael Meer2013-09-111-1/+1
| * | | delete logger line; was the wrong place.Michael Meer2013-09-111-1/+0
| * | | flag failed auth attempts in DB table hublocMichael Meer2013-09-112-1/+9
* | | | assuming this doesn't blow up the internet like the last fix - this is a very...friendica2013-09-112-2/+2
|/ / /
* | | make comments work againfriendica2013-09-101-1/+2
* | | well that really stuffed things up...friendica2013-09-102-3/+3
* | | remove old debugging cruftfriendica2013-09-101-1/+1
* | | this should fix the foreign language like notifications (again)friendica2013-09-101-2/+4
* | | change wording on item_store message so we can find failures fast with grep i...friendica2013-09-101-1/+1
* | | provide detailed error to remote site for the myriad of things that can go wr...friendica2013-09-1010-32/+72
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-1011-17/+20
|\ \ \
| * \ \ Merge pull request #126 from MicMee/masterfriendica2013-09-103-6/+11
| |\ \ \
| | * | | extends DB in hubloc to maintain hubloc connectivityMichael Meer2013-09-103-6/+11
| * | | | Merge pull request #128 from oohlaf/fixesOlaf Conradi2013-09-101-2/+1
| |\ \ \ \
| | * | | | No need to add name_updated twice in zfinger responseOlaf Conradi2013-09-111-2/+1
| |/ / / /
| * | | | Merge pull request #127 from git-marijus/masterfriendica2013-09-101-3/+2
| |\ \ \ \
| | * | | | make /channel respect "Maximum number of conversations to load at any time" s...marijus2013-09-101-3/+2
| |/ / / /
| * / / / Admin templates.Thomas Willingham2013-09-106-6/+6
| |/ / /