aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* add some debug loggingZach Prezkuta2012-06-251-0/+1
* revert extra Diaspora disabling changes to try to eliminate Mustard double-po...Zach Prezkuta2012-06-253-43/+23
* Clean up the Diaspora connectivity:Zach Prezkuta2012-06-253-55/+92
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-251-0/+1
|\
| * fix typo and syntax errorSimon L'nu2012-06-251-1/+1
* | typos in bbcode, add service class restrictions to jot uploadsfriendica2012-06-253-11/+14
|/
* Merge pull request #360 from fermionic/more-nested-listsfriendica2012-06-252-10/+13
|\
| * allow nested [ol] and [ul] lists tooZach Prezkuta2012-06-252-10/+13
* | fix check for parent of StatusNet API postZach Prezkuta2012-06-252-10/+11
|/
* more service class functionalityfriendica2012-06-251-0/+5
* service limits for photo uploadsfriendica2012-06-251-0/+25
* implement "follow" service limitsfriendica2012-06-242-1/+50
* add like/dislike to profilesfriendica2012-06-241-0/+5
* service class basicsfriendica2012-06-242-4/+48
* Merge pull request #357 from fermionic/fix-relayable-signature-handlefermionic2012-06-231-77/+20
|\
| * ok now I'm just making silly mistakes--take out premature function locking codeZach Prezkuta2012-06-231-77/+20
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-232-24/+90
|\ \
| * | Merge pull request #356 from fermionic/fix-relayable-signature-handlefermionic2012-06-231-24/+84
| |\|
| | * use author handle instead of sender handleZach Prezkuta2012-06-231-24/+84
| * | allow bare URLS to make it through to DiasporaZach Prezkuta2012-06-231-0/+6
| |/
* / sort out some "like" issuesfriendica2012-06-232-9/+13
|/
* small optimizationZach Prezkuta2012-06-231-5/+3
* fix BB-to-Diaspora list formattingZach Prezkuta2012-06-231-3/+43
* allow linking to Diaspora's scaled-down imagesZach Prezkuta2012-06-232-4/+17
* this is going to take some more debug before it can be roller outfriendica2012-06-231-2/+2
* debuggingfriendica2012-06-231-1/+2
* cokmment likes not propagatingfriendica2012-06-231-2/+5
* make feeds work with comment likes/dislikesfriendica2012-06-231-1/+1
* 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