aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
| | | * 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
| | * | propagate remote deletesfriendica2012-06-251-5/+8
| | * | improve remote delete forwardingfriendica2012-06-252-2/+64
| | |/
| | * 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
| | |/
| * | fixed direct message reply in api call.Sebastian Egbers2012-06-251-2/+2
| * | modified api message reply to set title to conversion title, when replying.Sebastian Egbers2012-06-251-8/+12
| * | Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-259-25/+218
| |\|
| | * 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
| * | Merge remote-tracking branch 'sebastian/master'Max Weller2012-06-231-15/+30
| |\ \
| | * | added replyto and subject to direct messages.Sebastian Egbers2012-06-221-7/+18
| | * | modified conversion to use x function for parameter checking.Sebastian Egbers2012-06-221-8/+12
| * | | add reliable way to get server versionMax Weller2012-06-231-1/+7
| * | | make it selectableMax Weller2012-06-231-1/+3
| * | | I want HTML code!Max Weller2012-06-231-1/+1
| * | | new param getUserObjects to avoid retransmitting the whole user info objectsMax Weller2012-06-231-0/+3
| * | | bugfixMax Weller2012-06-231-4/+5
| * | | changes on api_direct_messages_box to allow to retrieve conversations and all...Max Weller2012-06-231-13/+5
| * | | modified direct_messagesMax Weller2012-06-231-7/+29
| | |/ | |/|
| * | 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