aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* typofriendica2012-06-231-2/+4
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-2311-34/+2980
|\
| * Merge remote branch 'upstream/master'Michael Vogel2012-06-2310-108/+219
| |\
| * | Diaspora: Messages are now looking betterMichael Vogel2012-06-231-2/+18
| * | Merge branch 'master' of github.com:annando/friendicaMichael2012-06-1811-35/+2963
| |\ \
| | * | New option in the bbcode parser to disable oembed.Michael Vogel2012-06-182-26/+35
| | * | New function to convert bbcode to markdown.Michael Vogel2012-06-1710-19/+2939
| * | | OEmbed: Don't output the width of imagesMichael2012-06-181-1/+2
* | | | like commentsfriendica2012-06-231-2/+2
* | | | liking comments backendfriendica2012-06-231-8/+12
| |_|/ |/| |
* | | cleanup lists and more comment signature stuffZach Prezkuta2012-06-221-2/+13
* | | expand support for BB code-to-Diaspora conversionZach Prezkuta2012-06-221-20/+42
* | | Added ORDER BY clause for conversation viewMax Weller2012-06-211-1/+1
* | | Added statuses/show parameter ?conversation=trueMax Weller2012-06-211-10/+17
* | | show last.fm source in usernamefriendica2012-06-201-0/+1
* | | follow last.fm scrobblesfriendica2012-06-201-1/+9
* | | create new signed text for relayables right when relaying themZach Prezkuta2012-06-201-52/+28
* | | undefined unmark_for_deathfriendica2012-06-201-0/+1
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-201-2/+9
|\ \ \
| * \ \ Merge pull request #344 from ridcully/masterfriendica2012-06-201-2/+9
| |\ \ \
| | * | | added exclude_replies option to api call statuses/user_timeline.Sebastian Egbers2012-06-191-1/+4
| | * | | added exclude_replies option to api call statuses/home_timeline.Sebastian Egbers2012-06-191-1/+5
* | | | | iframes were getting stripped at the rss/atom parser level. We can preserve t...friendica2012-06-201-0/+2
* | | | | allow dfrn_deliver to undo a mark_for_death just in case the poller is consis...friendica2012-06-191-0/+5
|/ / / /
* | | | plugin optimisation - don't loop through every single plugin callback for eve...friendica2012-06-191-17/+18
* | | | Added App::get_cached_avatar_image usage on conversation wall of Normal ViewZvi ben Yaakov (a.k.a rdc)2012-06-191-1/+1
* | | | Now using App::get_cached_avatar_image for navigation barZvi ben Yaakov (a.k.a rdc)2012-06-191-2/+2
* | | | Beginning to use App::get_cached_avatar_image for loading profile images in c...Zvi ben Yaakov (a.k.a rdc)2012-06-191-1/+1
|/ / /
* | | exif_read_data may not be available and isn't a requirement - check and silen...friendica2012-06-181-0/+3
* | | fix some whitespace issuesZach Prezkuta2012-06-181-13/+13
* | | rotate uploaded images if an EXIF rotation is presentZach Prezkuta2012-06-181-1/+61
* | | public forum author using private posting, correct the comment permissions do...friendica2012-06-181-0/+6
* | | Typo breaking tag notificationsThomas Willingham2012-06-181-1/+1
|/ /
* | Added missing backticks to navigation bar queryZvi ben Yaakov (a.k.a rdc)2012-06-171-1/+1
* | Enabled Profile photo revisions to be displayed in navigation barZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|/
* rev updatefriendica2012-06-161-3/+3
* Merge remote branch 'upstream/master'Hauke Zuehl2012-06-162-72/+109
|\
| * Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-th...fermionic2012-06-161-71/+108
| |\
| | * more cleanupZach Prezkuta2012-06-161-15/+0
| | * some cleanup of obsolete codeZach Prezkuta2012-06-161-31/+6
| | * still need the original author information for comments and likesZach Prezkuta2012-06-161-0/+24
| | * update signature checking for relayablesZach Prezkuta2012-06-161-69/+122
| * | fix small typo for logging command in api.phpZach Prezkuta2012-06-161-1/+1
| |/
* | 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