| Commit message (Expand) | Author | Age | Files | Lines |
* | restore 'shareable' to feeds after recent feed privacy re-factoring | friendica | 2012-06-30 | 1 | -1/+1 |
* | nav: pass $baseurl to template | Fabrixxm | 2012-06-29 | 1 | -0/+1 |
* | wrong column name (- vs _) | friendica | 2012-06-28 | 1 | -1/+1 |
* | remote_self feeds are not private | friendica | 2012-06-28 | 1 | -1/+5 |
* | create third privacy state - public post but not searchable or publicly visible | friendica | 2012-06-28 | 5 | -16/+17 |
* | css smiley class | friendica | 2012-06-28 | 1 | -35/+35 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-28 | 2 | -6/+6 |
|\ |
|
| * | fix logic for nested lists--should be OR, not AND | Zach Prezkuta | 2012-06-27 | 2 | -6/+6 |
* | | remove titles in ostatus even when edited date differs from created date | friendica | 2012-06-28 | 1 | -18/+22 |
|/ |
|
* | moved api direct message formating to own function. | Sebastian Egbers | 2012-06-26 | 1 | -54/+54 |
* | 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 double-po... | Zach Prezkuta | 2012-06-25 | 3 | -43/+23 |
| | * | Clean up the Diaspora connectivity: | Zach Prezkuta | 2012-06-25 | 3 | -55/+92 |
| * | | 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 |
| |\ |
|
| | * | fix typo and syntax error | Simon L'nu | 2012-06-25 | 1 | -1/+1 |
| * | | 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 | 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 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 | 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 |
|\ \ |
|