aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Hauke Zuehl2012-06-1611-84/+295
|\
| * rev updatefriendica2012-06-161-10/+0
| * redundant log entryfriendica2012-06-141-1/+0
| * also mark for death if there isn't any xml to be foundfriendica2012-06-141-0/+3
| * poll even if contact hasn't responded recently, so we can update the terminat...friendica2012-06-142-5/+3
| * better handling of dead contactsfriendica2012-06-142-1/+8
| * syntax on sqlfriendica2012-06-131-1/+1
| * remove php version restriction on archive widgetfriendica2012-06-131-8/+4
| * couple of little fixes to enotify positional paramsfriendica2012-06-131-2/+2
| * fix to imported youtube videos, updating of contact profile photos, do not re...friendica2012-06-134-34/+105
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-131-1/+1
| |\
| | * Merge pull request #333 from Erkan-Yilmaz/masterfriendica2012-06-131-1/+1
| | |\
| | | * add missing bracketErkan Yilmaz2012-06-131-1/+1
| * | | Merge https://github.com/fabrixxm/friendica into pullfriendica2012-06-131-21/+41
| |\ \ \ | | |/ / | |/| |
| | * | enotify: fix stupid typofabrixxm2012-06-131-1/+1
| | * | enotify: rework strings to more easy to translatefabrixxm2012-06-131-21/+41
| | |/
| * / disable archive widget for PHP < 5.3friendica2012-06-131-0/+12
| |/
| * this should catch any weirdness caused by being in different timezones and ma...friendica2012-06-121-4/+10
| * that was itfriendica2012-06-121-1/+1
| * think this will fix itfriendica2012-06-121-0/+1
| * tracking another edge casefriendica2012-06-121-2/+4
| * edge casefriendica2012-06-121-0/+2
| * archive widgetfriendica2012-06-121-0/+47
| * more fixesfriendica2012-06-121-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-121-1/+0
| |\
| | * Removed "oauth/authorize" from the list of not implemented functions since it...Michael Vogel2012-06-121-1/+0
| * | move parens to proper placefriendica2012-06-121-5/+5
| |/
| * survive bad/un-parseable input to datetime_convertfriendica2012-06-121-1/+1
| * Merge pull request #331 from mexon/upstreamfriendica2012-06-121-0/+10
| |\
| | * Add a hook for post-processing remote items after they've been stored in the ...Matthew Exon2012-06-121-0/+10
| * | revert an optimisation that was wrongfriendica2012-06-111-4/+3
| * | date based profile wall filter - backendfriendica2012-06-111-0/+13
| * | reduce reverted edits due to edit arriving before originalfriendica2012-06-111-3/+26
| * | variable confusion in poller, don't allow negative page offsetsfriendica2012-06-112-4/+4
| * | sheeshfriendica2012-06-111-1/+1
| * | bug #447 - make followed feeds privatefriendica2012-06-111-3/+16
* | | Check if $rr existsHauke Zuehl2012-06-161-4/+2
|/ /
* | ostatus hub subscription issuesfriendica2012-06-073-4/+13
* | png support for embedded private photosfriendica2012-06-071-2/+2
* | png support: update database.sql, fix some typos, fix tinymce image browserFabio Comuni2012-06-071-11/+13
* | Add support for PNG images with alphaFabio Comuni2012-06-074-24/+130
* | fix a random profile error messagefabrixxm2012-06-071-1/+3
|/
* more logging on subscribe_to_hubfriendica2012-06-061-1/+6
* add email probe logging, limit typo check to main addon files and skip additi...friendica2012-06-051-0/+3
* Merge remote branch 'upstream/master'Michael Vogel2012-06-0415-99/+875
|\
| * Debugged implementation of Diaspora relayable_retractionsZach Prezkuta2012-06-032-1/+3
| * cleanup and loggingZach Prezkuta2012-06-031-22/+20
| * first shot at getting like/unlike functions to work consistentlyZach Prezkuta2012-06-034-20/+31
| * Fix bugs in the retraction codeZach Prezkuta2012-06-034-61/+37
| * Implement relaying of relayable_retractionsZach Prezkuta2012-06-034-36/+165