Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge pull request #360 from fermionic/more-nested-lists | friendica | 2012-06-25 | 2 | -10/+13 | |
| | |\ | | | | | | | | | allow nested [ol] and [ul] lists too | |||||
| | | * | allow nested [ol] and [ul] lists too | Zach Prezkuta | 2012-06-25 | 2 | -10/+13 | |
| | | | | ||||||
| | * | | fix check for parent of StatusNet API post | Zach Prezkuta | 2012-06-25 | 2 | -10/+11 | |
| | |/ | ||||||
| * | | fixed direct message reply in api call. | Sebastian Egbers | 2012-06-25 | 1 | -2/+2 | |
| | | | ||||||
| * | | modified api message reply to set title to conversion title, when replying. | Sebastian Egbers | 2012-06-25 | 1 | -8/+12 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/friendica/friendica | Sebastian Egbers | 2012-06-25 | 9 | -25/+218 | |
| |\| | ||||||
| | * | more service class functionality | friendica | 2012-06-25 | 1 | -0/+5 | |
| | | | ||||||
| | * | service limits for photo uploads | friendica | 2012-06-25 | 1 | -0/+25 | |
| | | | ||||||
| | * | implement "follow" service limits | friendica | 2012-06-24 | 2 | -1/+50 | |
| | | | ||||||
| | * | add like/dislike to profiles | friendica | 2012-06-24 | 1 | -0/+5 | |
| | | | ||||||
| | * | service class basics | friendica | 2012-06-24 | 2 | -4/+48 | |
| | | | ||||||
| | * | Merge pull request #357 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -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 code | Zach Prezkuta | 2012-06-23 | 1 | -77/+20 | |
| | | | | ||||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-23 | 2 | -24/+90 | |
| | |\ \ | ||||||
| | | * | | Merge pull request #356 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -24/+84 | |
| | | |\| | | | | | | | | | | | use author handle instead of sender handle | |||||
| | | | * | use author handle instead of sender handle | Zach Prezkuta | 2012-06-23 | 1 | -24/+84 | |
| | | | | | ||||||
| | | * | | allow bare URLS to make it through to Diaspora | Zach Prezkuta | 2012-06-23 | 1 | -0/+6 | |
| | | |/ | ||||||
| | * / | sort out some "like" issues | friendica | 2012-06-23 | 2 | -9/+13 | |
| | |/ | ||||||
| | * | small optimization | Zach Prezkuta | 2012-06-23 | 1 | -5/+3 | |
| | | | ||||||
| | * | fix BB-to-Diaspora list formatting | Zach Prezkuta | 2012-06-23 | 1 | -3/+43 | |
| | | | ||||||
| | * | allow linking to Diaspora's scaled-down images | Zach Prezkuta | 2012-06-23 | 2 | -4/+17 | |
| | | | ||||||
| | * | this is going to take some more debug before it can be roller out | friendica | 2012-06-23 | 1 | -2/+2 | |
| | | | ||||||
| | * | debugging | friendica | 2012-06-23 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'sebastian/master' | Max Weller | 2012-06-23 | 1 | -15/+30 | |
| |\ \ | ||||||
| | * | | added replyto and subject to direct messages. | Sebastian Egbers | 2012-06-22 | 1 | -7/+18 | |
| | | | | ||||||
| | * | | modified conversion to use x function for parameter checking. | Sebastian Egbers | 2012-06-22 | 1 | -8/+12 | |
| | | | | ||||||
| * | | | add reliable way to get server version | Max Weller | 2012-06-23 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | make it selectable | Max Weller | 2012-06-23 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | I want HTML code! | Max Weller | 2012-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | new param getUserObjects to avoid retransmitting the whole user info objects | Max Weller | 2012-06-23 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | bugfix | Max Weller | 2012-06-23 | 1 | -4/+5 | |
| | | | | ||||||
| * | | | changes on api_direct_messages_box to allow to retrieve conversations and ↵ | Max Weller | 2012-06-23 | 1 | -13/+5 | |
| | | | | | | | | | | | | | | | | all messages | |||||
| * | | | modified direct_messages | Max Weller | 2012-06-23 | 1 | -7/+29 | |
| | |/ | |/| | ||||||
| * | | cokmment likes not propagating | friendica | 2012-06-23 | 1 | -2/+5 | |
| | | | ||||||
| * | | make feeds work with comment likes/dislikes | friendica | 2012-06-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | typo | friendica | 2012-06-23 | 1 | -2/+4 | |
| | | | ||||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-23 | 11 | -34/+2980 | |
| |\ \ | ||||||
| | * \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-06-23 | 10 | -108/+219 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php | |||||
| | * | | | Diaspora: Messages are now looking better | Michael Vogel | 2012-06-23 | 1 | -2/+18 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-06-18 | 11 | -35/+2963 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/oembed.php | |||||
| | | * | | | New option in the bbcode parser to disable oembed. | Michael Vogel | 2012-06-18 | 2 | -26/+35 | |
| | | | | | | ||||||
| | | * | | | New function to convert bbcode to markdown. | Michael Vogel | 2012-06-17 | 10 | -19/+2939 | |
| | | | | | | ||||||
| | * | | | | OEmbed: Don't output the width of images | Michael | 2012-06-18 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | like comments | friendica | 2012-06-23 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | liking comments backend | friendica | 2012-06-23 | 1 | -8/+12 | |
| | |_|/ / | |/| | | | ||||||
| * | | | | cleanup lists and more comment signature stuff | Zach Prezkuta | 2012-06-22 | 1 | -2/+13 | |
| | | | | | ||||||
| * | | | | expand support for BB code-to-Diaspora conversion | Zach Prezkuta | 2012-06-22 | 1 | -20/+42 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-23 | 16 | -250/+560 | |
|\| | | | ||||||
| * | | | Added ORDER BY clause for conversation view | Max Weller | 2012-06-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Added statuses/show parameter ?conversation=true | Max Weller | 2012-06-21 | 1 | -10/+17 | |
| | | | |