aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* service class basicsfriendica2012-06-244-8/+52
|
* 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 locki...
| * 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 handle
| | * use author handle instead of sender handleZach Prezkuta2012-06-231-24/+84
| | |
| * | Merge pull request #355 from ↵fermionic2012-06-231-0/+6
| |\ \ | | |/ | |/| | | | | | | fermionic/missing-urls-after-strip_tags-in-bb2diaspora allow bare URLS to make it through to Diaspora
| | * allow bare URLS to make it through to DiasporaZach Prezkuta2012-06-231-0/+6
| |/
* / sort out some "like" issuesfriendica2012-06-234-78/+73
|/
* Merge pull request #354 from fermionic/always-terminate-bbcode-list-elementsfermionic2012-06-231-3/+41
|\ | | | | Fix Diaspora list formatting
| * small optimizationZach Prezkuta2012-06-231-5/+3
| |
| * fix BB-to-Diaspora list formattingZach Prezkuta2012-06-231-3/+43
|/
* Merge pull request #352 from fermionic/diaspora-display-scaled-down-imageSimon2012-06-232-4/+17
|\ | | | | allow linking to Diaspora's scaled-down images
| * allow linking to Diaspora's scaled-down imagesZach Prezkuta2012-06-232-4/+17
| |
* | Merge pull request #353 from simonlnu/masterSimon2012-06-239-43/+53
|\ \ | |/ |/| jquery update; templates
| * update jquery to 1.7.2; fix some dispy templates to be more in sync with view/Simon L'nu2012-06-239-43/+53
|/ | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* 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 pull request #351 from annando/masterfriendica2012-06-2311-34/+2980
| |\ | | | | | | Massive change in bbcode2markdown
| | * Merge remote branch 'upstream/master'Michael Vogel2012-06-2340-4763/+5539
| | |\ | | |/ | |/| | | | | | | Conflicts: include/bb2diaspora.php
| | * Diaspora: Messages are now looking betterMichael Vogel2012-06-231-2/+18
| | |
| | * Merge branch 'master' of github.com:annando/friendicaMichael2012-06-1811-35/+2963
| | |\ | | | | | | | | | | | | | | | | Conflicts: include/oembed.php
| | | * 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-232-3/+4
| | | |
* | | | liking comments backendfriendica2012-06-234-12/+20
|/ / /
* | | cleanup mod/sharefriendica2012-06-231-14/+11
| | |
* | | Merge pull request #350 from fermionic/improve-bb2diaspora-conversionsfermionic2012-06-221-20/+53
|\ \ \ | | | | | | | | Improve bb2diaspora conversions
| * | | 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
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-223-3/+4
|\ \ \
| * \ \ Merge pull request #349 from simonlnu/masterSimon2012-06-223-3/+4
| |\ \ \ | | | | | | | | | | minor template tweaks
| | * | | minor tweaks to some tpl filesSimon L'nu2012-06-223-3/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* / / / share RSS itemsfriendica2012-06-223-5/+5
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-221-10/+17
|\ \ \
| * \ \ Merge pull request #348 from max-weller/masterfriendica2012-06-211-10/+17
| |\ \ \ | | | | | | | | | | List statuses by conversation_id
| | * | | Added ORDER BY clause for conversation viewMax Weller2012-06-211-1/+1
| | | | |
| | * | | Added statuses/show parameter ?conversation=trueMax Weller2012-06-211-10/+17
| |/ / /
* / / / unterminated sql stringfriendica2012-06-223-68/+76
|/ / /
* | | show last.fm source in usernamefriendica2012-06-201-0/+1
| | |
* | | follow last.fm scrobblesfriendica2012-06-201-1/+9
| | |
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-205-65/+56
|\ \ \
| * \ \ Merge pull request #346 from fermionic/add-rotate-ccw-optionfriendica2012-06-202-11/+18
| |\ \ \ | | | | | | | | | | allow rotation to be either CW or CCW
| | * | | allow rotation either CW or CCWZach Prezkuta2012-06-202-11/+18
| | | | |
| * | | | Merge pull request #347 from fermionic/diaspora-more-signature-refinementsfermionic2012-06-201-52/+28
| |\ \ \ \ | | |/ / / | |/| | | create new signed text for relayables right when relaying them