| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-05-01 | 85 | -2812/+3625 |
| |\ |
|
| | * | 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 |
| | |/ / / / / / / |
|
| | * | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-30 | 5 | -7/+327 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | diabook-themes: add "last tweets"-box to right_aside, that searches for #frie... | tommy tomson | 2012-05-01 | 5 | -7/+327 |
| | * | | | | | | | | make 'aaa joined group bbb' work from the initiating end, new privacy pref to... | friendica | 2012-04-30 | 3 | -29/+81 |
| | |/ / / / / / / |
|
| | * | | | | | | | rev update | friendica | 2012-04-30 | 2 | -359/+500 |
| | * | | | | | | | start adding tooltips to tab menus | friendica | 2012-04-30 | 3 | -0/+23 |
| | * | | | | | | | fix join group notifications | friendica | 2012-04-30 | 2 | -5/+7 |
| | | |_|_|_|_|/
| |/| | | | | |
|
| | * | | | | | | Merge pull request #277 from mschmitt/master | friendica | 2012-04-30 | 2 | -784/+649 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Update Esperanto to 100% | Martin Schmitt | 2012-04-30 | 2 | -784/+649 |
| | * | | | | | | | Merge pull request #278 from max-weller/meta_viewport | friendica | 2012-04-30 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | adding META viewport tag for better look on tablets | Max Weller | 2012-04-30 | 1 | -0/+1 |
| | | |/ / / / / / |
|
| | * | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-30 | 4 | -868/+766 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-30 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | DE update to the strings | Tobias Diekershoff | 2012-04-30 | 4 | -868/+766 |
| | * | | | | | | | | provide "xxx joined yyy" notifications | friendica | 2012-04-30 | 1 | -11/+34 |
| | | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | | activitystreams schema constants for "join group" | friendica | 2012-04-29 | 1 | -0/+3 |
| | |/ / / / / / |
|
| | * | | | | | | Merge pull request #276 from tomtom84/master | friendica | 2012-04-29 | 1 | -6/+10 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | close one menu (like the notifications menu) when another one is opened (like... | tommy tomson | 2012-04-30 | 1 | -6/+10 |
| | | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | | missed a db field | friendica | 2012-04-29 | 1 | -1/+1 |
| | * | | | | | | typo in profile_selectors, fix remote tagging | friendica | 2012-04-29 | 3 | -21/+37 |
| | * | | | | | | not all profile selector choices have unique or direct translations | friendica | 2012-04-29 | 1 | -6/+12 |
| | * | | | | | | log db error strings in all cases | friendica | 2012-04-29 | 1 | -3/+3 |
| | * | | | | | | admin page to manage failed updates | friendica | 2012-04-29 | 4 | -3/+83 |
| | * | | | | | | improved db error logging | friendica | 2012-04-29 | 3 | -124/+157 |
| | |/ / / / / |
|
| | * | | | | | the heart should really be red. | friendica | 2012-04-29 | 1 | -1/+1 |
| | * | | | | | fix location change notification | friendica | 2012-04-29 | 1 | -1/+1 |
| | * | | | | | enhanced profile reporting for single values | friendica | 2012-04-29 | 1 | -15/+51 |
| | * | | | | | add db field for removed account, which will also be the first test of update... | friendica | 2012-04-29 | 3 | -4/+13 |
| | * | | | | | toggle to archive unfriends, though render them useless | friendica | 2012-04-28 | 1 | -0/+15 |
| | * | | | | | indicate successful updates | friendica | 2012-04-28 | 1 | -4/+8 |
| | * | | | | | diabook-themes: small fix | tommy tomson | 2012-04-29 | 2 | -2/+2 |
| | * | | | | | diabook-themes: bug/css-fixes | tommy tomson | 2012-04-29 | 23 | -98/+126 |
| | * | | | | | some constants for the db update failure possibilities | friendica | 2012-04-28 | 1 | -0/+8 |
| | * | | | | | bring back the email and logging of update failures, but without the transact... | friendica | 2012-04-28 | 2 | -25/+19 |
| | | |_|_|/
| |/| | | |
|
| | * | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-28 | 1 | -1/+1 |
| | |\ \ \ \ |
|
