aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* figuring out how to bootstrap the change_primary procedure when all you have ...friendica2014-10-132-0/+6
* fix import sql errorfriendica2014-10-131-1/+1
* don't use cached datafriendica2014-10-131-0/+2
* there's the problemfriendica2014-10-131-2/+2
* more diagnostic when changing primaryfriendica2014-10-131-4/+17
* this bug has been there for a *long* time. First time I've ever seen it trigg...friendica2014-10-131-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-137-200/+251
|\
| * Merge pull request #638 from dawnbreak/RedDAVRedMatrix2014-10-147-200/+251
| |\
| | * When you delete something in /cloud stay in the right folder.Klaus Weidenbach2014-10-147-200/+251
| |/
* | sqlfriendica2014-10-131-1/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-134-13/+8
|\|
| * Merge pull request #637 from tuscanhobbit/devRedMatrix2014-10-141-0/+3
| |\
| | * one more hidden configtuscanhobbit2014-10-131-0/+3
| | * Merge from mastertuscanhobbit2014-10-1317-987/+1048
| | |\
| | | * Merge from origintuscanhobbit2014-10-130-0/+0
| | |/| | |/| |
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-132-3/+3
| |\ \ \
| * | | | really fix connedit > collection > checkboxmarijus2014-10-133-13/+5
| | | * | Merge pull request #6 from tuscanhobbit/masterPaolo T2014-10-12323-14648/+15815
| | | |\|
| | | | * Merge pull request #4 from friendica/masterPaolo T2014-10-12323-14649/+15818
| | | | |\
* | | | | | new function hubloc_change_primary()friendica2014-10-132-3/+60
| |/ / / / |/| | | |
* | | | | tinymce still seems to be referenced. Can't quite get rid of it.friendica2014-10-131-1/+1
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-131-0/+2
|\| | | |
| * | | | fix connedit > collection > checkbox position also for webkit - this will nee...marijus2014-10-131-0/+2
* | | | | bring back PM upload functionality and why oh why are we still loading tinymce?friendica2014-10-133-4/+4
|/ / / /
* | | | context checkfriendica2014-10-121-1/+1
* | | | diaspora_send_status() - recalculate markdown translation to pickup any later...friendica2014-10-122-3/+3
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-126-928/+985
|\ \ \ \
| * \ \ \ Merge pull request #636 from dawnbreak/RedDAVRedMatrix2014-10-136-928/+985
| |\ \ \ \
| | * | | | A fix, but I have no case to verify.Klaus2014-10-121-2/+2
| | * | | | Moved classes from reddav.php into own files.Klaus Weidenbach2014-10-126-926/+983
| | | |_|/ | | |/| |
* | / | | bit of cleanup of hidden_configs. This is a start - we've got hundreds more.friendica2014-10-121-37/+30
|/ / / /
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-122-7/+15
|\ \ \ \
| * | | | fix connedit > collection > checkbox positionmarijus2014-10-122-7/+15
* | | | | cleanup of sync_locations and better logging. There was one significant code ...friendica2014-10-121-7/+11
|/ / / /
* / / / content deletion issuefriendica2014-10-122-2/+7
|/ / /
* | | Some more previously undocumented configs.Thomas Willingham2014-10-111-0/+49
* | | Show tag in siteinfo. Not useful for us, quite useful for admins.Thomas Willingham2014-10-112-1/+7
* | | FFS, another oopsThomas Willingham2014-10-111-2/+0
* | | Fix webpages. Sycning between too many codebases...Thomas Willingham2014-10-111-1/+3
* | | Also that doesn't work anymore - prettyPhoto relicThomas Willingham2014-10-111-1/+1
* | | Give Redbasic the -styled backThomas Willingham2014-10-111-1/+1
* | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-111-1/+2
|\ \ \
| * | | +1Jeroen2014-10-111-1/+2
* | | | Unbreak webpagesThomas Willingham2014-10-112-3/+2
|/ / /
* | | Doco: Hidden configs - you won't believe what happens next!Thomas Willingham2014-10-111-0/+58
* | | fix diaspora reshare tagsfriendica2014-10-102-1/+3
* | | ah yes, the redundant relay run was for the benefit of wall-to-wall posts iss...friendica2014-10-101-2/+1
* | | missing source route after editfriendica2014-10-102-1/+3
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-10151-8229/+6920
|\ \ \
| * | | and more missing wrappersmarijus2014-10-1018-20/+28