aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-250-0/+0
| | |\ \
* | | | | remove titles in ostatus even when edited date differs from created datefriendica2012-06-283-143/+147
|/ / / /
* | | | Merge pull request #365 from ridcully/masterfriendica2012-06-271-63/+108
|\ \ \ \
| * | | | 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-2627-435/+709
| |\ \ \ \
| * | | | | 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-2530-227/+544
| |\ \ \ \ \
| * \ \ \ \ \ 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
* | | | | | | | insidious little parsing bugfriendica2012-06-262-2/+8
* | | | | | | | have no idea why the if/endif macro block was getting printed and not processed.friendica2012-06-261-6/+4
* | | | | | | | highlight js events-reminder on birthday eventsfriendica2012-06-271-1/+7
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | service class restrict the email connectorfriendica2012-06-263-75/+83
| |_|_|/ / / |/| | | | |
* | | | | | 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-253-8/+32
* | | | | | event summary/titlefriendica2012-06-259-9/+58
* | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-255-130/+210
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #364 from fermionic/diaspora-refactor-and-better-disablingfermionic2012-06-255-130/+210
| |\ \ \ \ \ \
| | * | | | | | remove possibly unnecessary checks for likes or comments created by Diaspora ...Zach Prezkuta2012-06-252-51/+51
| | * | | | | | store signature info for remote users tooZach Prezkuta2012-06-252-17/+24
| | * | | | | | was passing the wrong arguments to the signature storage functionZach Prezkuta2012-06-251-1/+1
| | * | | | | | add some debug loggingZach Prezkuta2012-06-253-2/+8
| | * | | | | | 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-255-128/+215
| |/ / / / / /
* | | | | | | propagate remote deletesfriendica2012-06-251-5/+8
* | | | | | | improve remote delete forwardingfriendica2012-06-252-2/+64
|/ / / / / /
* | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-255-4/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #363 from simonlnu/masterSimon2012-06-251-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | fix typo and syntax errorSimon L'nu2012-06-251-1/+1
| * | | | | Merge pull request #362 from simonlnu/masterSimon2012-06-254-4/+4
| |\| | | |
| | * | | | fix margin of wall-item-bodySimon L'nu2012-06-254-4/+4
| |/ / / /
* | | | | typos in bbcode, add service class restrictions to jot uploadsfriendica2012-06-255-11/+40
* | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-2510-60/+40
|\| | | |
| * | | | Merge pull request #361 from simonlnu/masterSimon2012-06-254-38/+14
| |\ \ \ \
| | * | | | fix delete thingy, and minor clean upSimon L'nu2012-06-254-38/+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
| | |/ / /
| * | | | Merge pull request #359 from fermionic/mustard-prevent-comment-doublesfriendica2012-06-253-11/+12
| |\ \ \ \