| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #369 from rdc/master | friendica | 2012-07-01 | 3 | -10/+127 |
|\ |
|
| * | Added more profile data and CSS styling to the /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-07-01 | 3 | -10/+127 |
* | | Merge pull request #370 from mschmitt/master | friendica | 2012-07-01 | 3 | -1555/+2127 |
|\ \ |
|
| * | | Esperanto -> 100% | Martin Schmitt | 2012-07-01 | 3 | -1555/+2127 |
|/ / |
|
* / | rev update | friendica | 2012-06-30 | 2 | -60/+68 |
|/ |
|
* | bug #437 | friendica | 2012-06-30 | 1 | -0/+8 |
* | restore 'shareable' to feeds after recent feed privacy re-factoring | friendica | 2012-06-30 | 1 | -1/+1 |
* | advanced profile theming | friendica | 2012-06-30 | 1 | -1/+6 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-29 | 13 | -45/+638 |
|\ |
|
| * | Merge pull request #368 from fabrixxm/master | friendica | 2012-06-29 | 13 | -45/+638 |
| |\ |
|
| | * | quattro: fix Forum widget, hide edit profile link | Fabrixxm | 2012-06-29 | 3 | -3/+11 |
| | * | quattro: some updates | Fabrixxm | 2012-06-29 | 12 | -45/+629 |
| | * | nav: pass $baseurl to template | Fabrixxm | 2012-06-29 | 1 | -0/+1 |
| |/ |
|
* / | convert ent_quotes for jquery calendar title/summary | friendica | 2012-06-29 | 3 | -69/+69 |
|/ |
|
* | maintain page position when hovering on pop-outs | friendica | 2012-06-28 | 1 | -0/+7 |
* | more pager limits | friendica | 2012-06-28 | 1 | -0/+2 |
* | wrong column name (- vs _) | friendica | 2012-06-28 | 1 | -1/+1 |
* | undefined fn | friendica | 2012-06-28 | 1 | -2/+2 |
* | 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 | 9 | -20/+21 |
* | css smiley class | friendica | 2012-06-28 | 1 | -35/+35 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-28 | 7 | -19/+19 |
|\ |
|
| * | Merge pull request #367 from simonlnu/master | Simon | 2012-06-28 | 4 | -12/+12 |
| |\ |
|
| | * | fix item-delete-selected* css | Simon L'nu | 2012-06-28 | 4 | -12/+12 |
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-28 | 2 | -6/+6 |
| | |\
| | |/
| |/| |
|
| * | | Merge pull request #366 from fermionic/fix-big-monster-list-logic | fermionic | 2012-06-27 | 2 | -6/+6 |
| |\ \ |
|
| | * | | fix logic for nested lists--should be OR, not AND | Zach Prezkuta | 2012-06-27 | 2 | -6/+6 |
| |/ / |
|
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-27 | 4 | -64/+119 |
| | |\
| | |/
| |/| |
|
| * | | Friendicaland - couple of new 'countries' | Thomas Willingham | 2012-06-27 | 1 | -1/+1 |
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-26 | 22 | -439/+741 |
| | |\ |
|
| | * \ | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-25 | 0 | -0/+0 |
| | |\ \ |
|
* | | | | | remove titles in ostatus even when edited date differs from created date | friendica | 2012-06-28 | 3 | -143/+147 |
|/ / / / |
|
* | | | | Merge pull request #365 from ridcully/master | friendica | 2012-06-27 | 1 | -63/+108 |
|\ \ \ \ |
|
| * | | | | 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 | 27 | -435/+709 |
| |\ \ \ \ |
|
| * | | | | | 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 | 30 | -227/+544 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | 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 all... | Max Weller | 2012-06-23 | 1 | -13/+5 |
| * | | | | | | | modified direct_messages | Max Weller | 2012-06-23 | 1 | -7/+29 |
* | | | | | | | | insidious little parsing bug | friendica | 2012-06-26 | 2 | -2/+8 |
* | | | | | | | | have no idea why the if/endif macro block was getting printed and not processed. | friendica | 2012-06-26 | 1 | -6/+4 |