| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-02 | 11 | -412/+458 |
|\ |
|
| * | diabook-themes: more improvements in theme.php, add titles to bbcode under co... | tommy tomson | 2012-05-02 | 4 | -28/+47 |
| * | diabook-theme: tryied to improve performance a bit | tommy tomson | 2012-05-02 | 2 | -377/+370 |
| * | diabook-theme: fix footer/impressum | tommy tomson | 2012-05-02 | 1 | -1/+3 |
| * | missing param | friendica | 2012-05-02 | 1 | -1/+2 |
| * | provide "service_class" identifier which will let us provide service_class li... | friendica | 2012-05-02 | 3 | -3/+14 |
| * | delineate the new profile changes from the rest of the text | friendica | 2012-05-02 | 1 | -1/+1 |
| * | how did that happen? | friendica | 2012-05-02 | 1 | -1/+1 |
| * | shuffle results of remote_common_friends widget | friendica | 2012-05-02 | 2 | -8/+25 |
| * | only validate once | friendica | 2012-05-01 | 1 | -3/+0 |
| * | perform basic validation | friendica | 2012-05-01 | 2 | -3/+9 |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-02 | 6 | -4/+109 |
|\| |
|
| * | final touches - show friends in common with total strangers from different sites | friendica | 2012-05-01 | 2 | -7/+13 |
| * | fix size | friendica | 2012-05-01 | 1 | -1/+1 |
| * | cross fingers | friendica | 2012-05-01 | 1 | -1/+1 |
| * | reduce the scope a bit | friendica | 2012-05-01 | 2 | -19/+11 |
| * | add template | friendica | 2012-05-01 | 1 | -0/+21 |
| * | fn not found | friendica | 2012-05-01 | 1 | -0/+1 |
| * | really fat fingers today - though none of this has gone further than my own site | friendica | 2012-05-01 | 1 | -1/+1 |
| * | another one | friendica | 2012-05-01 | 1 | -1/+1 |
| * | typo | friendica | 2012-05-01 | 1 | -1/+1 |
| * | first try common friends for visitors | friendica | 2012-05-01 | 4 | -1/+86 |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 0 | -0/+0 |
|/ |
|
* | improve handling of relative feed url's | friendica | 2012-05-01 | 1 | -1/+1 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-01 | 5 | -11/+13 |
|\ |
|
| * | More Diabook-dark touch-ups. Should *really* be useable this time...with edi... | Thomas Willingham | 2012-05-01 | 2 | -5/+7 |
| * | modified: images/smiley-thumbsup.gif | Thomas Willingham | 2012-05-01 | 1 | -0/+0 |
| * | diabook-themes: small fix at "community pages"-box | tommy tomson | 2012-05-01 | 2 | -6/+6 |
* | | convert html entities to utf-8 before email header encoding | friendica | 2012-05-01 | 3 | -194/+202 |
|/ |
|
* | link socgraph to zrls | friendica | 2012-05-01 | 2 | -25/+21 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-01 | 2 | -9/+11 |
|\ |
|
| * | Merge pull request #281 from simonlnu/master | Simon | 2012-05-01 | 2 | -9/+11 |
| |\ |
|
| | * | lighten bg and darken font on dispy light | Simon L'nu | 2012-05-01 | 2 | -9/+11 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 0 | -0/+0 |
| |/ |
|
* / | adding zrl support to social graphs | friendica | 2012-05-01 | 5 | -18/+39 |
|/ |
|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-30 | 27 | -84/+119 |
|\ |
|
| * | Merge pull request #280 from simonlnu/master | Simon | 2012-04-30 | 5 | -15/+9 |
| |\ |
|
| | * | sub-minor change to head.tpl | Simon L'nu | 2012-05-01 | 1 | -1/+1 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 34 | -462/+1041 |
| | |\
| | |/
| |/| |
|
| * | | diabook-themes: add "community profiles"-box to right_column | tommy tomson | 2012-05-01 | 22 | -69/+110 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-30 | 18 | -1821/+1750 |
| | |\ |
|
| | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-29 | 29 | -144/+238 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 4 | -134/+149 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 10 | -445/+548 |
| | |\ \ \ \ \ |
|
| | * | | | | | | fix #search-text | Simon L'nu | 2012-04-27 | 4 | -14/+8 |
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-27 | 0 | -0/+0 |
* | | | | | | | | hidden plugins (add .hidden file to dir) | friendica | 2012-04-30 | 7 | -12/+111 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api | friendica | 2012-04-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | change api.php in function api_item_get_user to check if $usercache is NULL b... | Zach Prezkuta | 2012-04-30 | 1 | -1/+1 |
|/ / / / / / / |
|