aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| |
| * | check the imagick version before using it.friendica2014-10-071-4/+16
| * | add ability to skip broken imagemagick on shared hostingnostupidzone2014-10-071-6/+10
| * | porting more widgets to bs nav-pillsmarijus2014-10-071-0/+2
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-062-324/+366
| |\ \
| | * \ Merge pull request #620 from dawnbreak/RedDAVRedMatrix2014-10-072-324/+366
| | |\ \
| | | * | Moved RedBrowser class from reddav.php to it's own file.Klaus Weidenbach2014-10-062-324/+366
| * | | | Make a best guess at how to pull the attribution from the recursive reshare f...friendica2014-10-061-0/+4
| |/ / /
| * | | found one bug trying to fetch the recursive reshare from hell. I still think ...friendica2014-10-061-2/+2
| * | | SQL error - private message conversation lookupfriendica2014-10-061-1/+1
| * | | shareable design elementsfriendica2014-10-061-0/+12
| |/ /
* | | Merge remote branch 'upstream/master'habeascodice2014-10-0617-139/+442
|\| |
| * | attempt to deal with the diaspora recursive reshare from hell (Bob reshared N...friendica2014-10-051-10/+40
| * | send dislike activities to diaspora as comments, also send likes and dislikes...friendica2014-10-051-13/+5
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-054-97/+229
| |\ \
| | * \ Merge pull request #616 from dawnbreak/docuRedMatrix2014-10-062-95/+227
| | |\ \
| | | * | Some documentation for include/reddav.php and a bit code cleanup.Klaus Weidenbach2014-10-051-42/+153
| | | * | Some documentation of include/auth.php.Klaus Weidenbach2014-10-051-53/+74
| | * | | image/jpeg > image/pngJeroen2014-10-051-1/+1
| | * | | Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl...Jeroen2014-10-051-1/+1
| | |/ /
| * / / diaspora share not rendering issue - still have one remaining (the recursive ...friendica2014-10-051-1/+1
| |/ /
| * | network page default optionfriendica2014-10-041-1/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 20:56:34 +0000