Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Sebastian Egbers | 2012-06-26 | 10 | -78/+190 | |
| |\ | ||||||
| | * | stray s | friendica | 2012-06-25 | 1 | -1/+1 | |
| | | | ||||||
| | * | typos | friendica | 2012-06-25 | 2 | -2/+2 | |
| | | | ||||||
| | * | add event titles to discovered birthday events | friendica | 2012-06-25 | 2 | -6/+11 | |
| | | | ||||||
| | * | change required doco | friendica | 2012-06-25 | 1 | -2/+5 | |
| | | | ||||||
| | * | change event behaviour so that title is required but description is not | friendica | 2012-06-25 | 1 | -2/+2 | |
| | | | ||||||
| | * | event summary/title | friendica | 2012-06-25 | 2 | -2/+15 | |
| | | | ||||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 3 | -37/+55 | |
| | |\ | ||||||
| | | * | add some debug logging | Zach Prezkuta | 2012-06-25 | 1 | -0/+1 | |
| | | | | ||||||
| | | * | revert extra Diaspora disabling changes to try to eliminate Mustard ↵ | Zach Prezkuta | 2012-06-25 | 3 | -43/+23 | |
| | | | | | | | | | | | | | | | | double-posting | |||||
| | | * | Clean up the Diaspora connectivity: | Zach Prezkuta | 2012-06-25 | 3 | -55/+92 | |
| | | | | | | | | | | | | | | | | | | | | - Move Diaspora code into separate functions to make it more modular - Create more checks for whether Diaspora connectivity has been enabled | |||||
| | * | | propagate remote deletes | friendica | 2012-06-25 | 1 | -5/+8 | |
| | | | | ||||||
| | * | | improve remote delete forwarding | friendica | 2012-06-25 | 2 | -2/+64 | |
| | |/ | ||||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 1 | -0/+1 | |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php | |||||
| | | * | fix typo and syntax error | Simon L'nu | 2012-06-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| | * | | typos in bbcode, add service class restrictions to jot uploads | friendica | 2012-06-25 | 3 | -11/+14 | |
| | |/ | ||||||
| | * | 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 | |
| | | |