aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'habeascodice2014-10-1321-957/+1139
|\
| * 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
* | Revert "x"habeascodice2014-10-111-1/+0
* | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-11301-11204/+11847
|\ \
| * | Merge remote branch 'upstream/master'habeascodice2014-10-11311-11353/+11964
| |\|
| | * 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
| | | * found more missing wrappersmarijus2014-10-102-2/+3
| | | * one more oups...marijus2014-10-101-2/+2
| | | * oups... that was weired...marijus2014-10-101-2/+1
| | | * This is a fix to not interfere the ongoing adding of .generic-content-wrapper...marijus2014-10-1018-19/+25
| | | * Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-10258-11145/+11812
| | | |\
| | | | * Merge pull request #632 from zzottel/masterzzottel2014-10-108-1321/+1385
| | | | |\
| | | | | * more updates to German strings plus email templateszottel2014-10-108-1321/+1385
| | | | |/
| | | | * Merge pull request #631 from zzottel/masterzzottel2014-10-10102-1885/+0
| | | | |\
| | | | | * remove unused email template fileszottel2014-10-10102-1885/+0
| | | | |/
| | | | * Merge pull request #630 from zzottel/masterzzottel2014-10-102-6172/+6675
| | | | |\
| | | | | * update to German stringszottel2014-10-102-6172/+6675
| | | | |/
| | | * | Good compromise I think. Remove display setting . Set the default (light) sch...Jeroen2014-10-104-10/+5
| | * | | remove remnants of old signing structure - now using diaspora_metafriendica2014-10-101-7/+0
| | * | | reset route to parent route on Diaspora comments flowing upstream so they won...friendica2014-10-101-3/+5
| | * | | make sure diaspora comments get the correct routefriendica2014-10-101-0/+4
| | | |/ | | |/|
| | * | improvement in source route checking when handling complex *upstream* deliver...friendica2014-10-103-1056/+1095