aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-151-1/+0
|\
| * Revert "x"habeascodice2014-10-111-1/+0
* | Merge remote branch 'upstream/master'habeascodice2014-10-1511-192/+324
|\ \
| * | back to wrestling with the !@#$ diaspora recursive reshare from hellfriendica2014-10-141-3/+8
| * | this is the reason Diaspora forum tagging was brokenfriendica2014-10-141-3/+4
| * | if a hubloc primary change results in an xchan primary change, create a direc...friendica2014-10-131-1/+5
| * | figuring out how to bootstrap the change_primary procedure when all you have ...friendica2014-10-132-0/+6
| * | 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-136-180/+224
| |\ \
| | * | When you delete something in /cloud stay in the right folder.Klaus Weidenbach2014-10-146-180/+224
| * | | sqlfriendica2014-10-131-1/+1
| * | | new function hubloc_change_primary()friendica2014-10-132-3/+60
| |/ /
* | / Merge remote branch 'upstream/master'habeascodice2014-10-139-935/+1001
|\| | | |/ |/|
| * diaspora_send_status() - recalculate markdown translation to pickup any later...friendica2014-10-122-3/+3
| * Merge pull request #636 from dawnbreak/RedDAVRedMatrix2014-10-135-924/+981
| |\
| | * Moved classes from reddav.php into own files.Klaus Weidenbach2014-10-125-924/+981
| * | cleanup of sync_locations and better logging. There was one significant code ...friendica2014-10-121-7/+11
| * | content deletion issuefriendica2014-10-121-1/+6
| |/
* | Merge remote branch 'upstream/master'habeascodice2014-10-118-29/+79
|\|
| * fix diaspora reshare tagsfriendica2014-10-101-0/+2
| * 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
| * 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-101-6/+19
| * allow (our own) ajax urls to pass through bbcode intact.friendica2014-10-093-3/+5
| * OK this is important. So read it carefully.friendica2014-10-091-3/+33
| * allow a site to over-ride the system app list without causing git issuesfriendica2014-10-091-1/+4
| * return of the missing diaspora wall-to-wall attributionfriendica2014-10-092-12/+12
| * fix userinfo icon sizemarijus2014-10-091-1/+1
* | Merge remote branch 'upstream/master'habeascodice2014-10-097-32/+74
|\|
| * try to track down intermittent wall-to-wall attribution on Diaspora exported ...friendica2014-10-091-0/+4
| * oembed issuesfriendica2014-10-081-7/+6
| * change parent constructor per discussionfriendica2014-10-081-1/+1
| * dav issuefriendica2014-10-081-1/+1
| * disable email notifications when bulk importing content.friendica2014-10-081-0/+32
| * don't double-encode hashtagsfriendica2014-10-081-4/+4
| * soundcloud using a slightly different oembed mechanism - react accordinglyfriendica2014-10-081-0/+9
| * Merge pull request #626 from habeascodice/masterRedMatrix2014-10-081-1/+1
| |\
| * | template for searchbox and some more work on saved searchesmarijus2014-10-081-19/+17
| * | put back local file check so body is fetched from z_ functionsnostupidzone2014-10-071-1/+1
* | | Merge remote branch 'upstream/master'habeascodice2014-10-072-13/+24
|\| |
| * | add imagick version check when guessing mimetype. It probably isn't important...friendica2014-10-071-10/+21
| * | log the recursive reshare from hell at logger_debug until we get through this...friendica2014-10-071-3/+3
* | | xhabeascodice2014-10-071-0/+1
* | | Merge remote branch 'upstream/master'habeascodice2014-10-077-335/+411
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 05:51:38 +0000