aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* css smiley classfriendica2012-06-281-35/+35
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-282-6/+6
|\
| * fix logic for nested lists--should be OR, not ANDZach Prezkuta2012-06-272-6/+6
* | remove titles in ostatus even when edited date differs from created datefriendica2012-06-281-18/+22
|/
* moved api direct message formating to own function.Sebastian Egbers2012-06-261-54/+54
* Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2610-78/+190
|\
| * stray sfriendica2012-06-251-1/+1
| * typosfriendica2012-06-252-2/+2
| * add event titles to discovered birthday eventsfriendica2012-06-252-6/+11
| * change required docofriendica2012-06-251-2/+5
| * change event behaviour so that title is required but description is notfriendica2012-06-251-2/+2
| * event summary/titlefriendica2012-06-252-2/+15
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-253-37/+55
| |\
| | * 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
| * | 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