aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0211-412/+458
|\
| * diabook-themes: more improvements in theme.php, add titles to bbcode under co...tommy tomson2012-05-024-28/+47
| * diabook-theme: tryied to improve performance a bittommy tomson2012-05-022-377/+370
| * diabook-theme: fix footer/impressumtommy tomson2012-05-021-1/+3
| * missing paramfriendica2012-05-021-1/+2
| * provide "service_class" identifier which will let us provide service_class li...friendica2012-05-023-3/+14
| * delineate the new profile changes from the rest of the textfriendica2012-05-021-1/+1
| * how did that happen?friendica2012-05-021-1/+1
| * shuffle results of remote_common_friends widgetfriendica2012-05-022-8/+25
| * only validate oncefriendica2012-05-011-3/+0
| * perform basic validationfriendica2012-05-012-3/+9
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-026-4/+109
|\|
| * final touches - show friends in common with total strangers from different sitesfriendica2012-05-012-7/+13
| * fix sizefriendica2012-05-011-1/+1
| * cross fingersfriendica2012-05-011-1/+1
| * reduce the scope a bitfriendica2012-05-012-19/+11
| * add templatefriendica2012-05-011-0/+21
| * fn not foundfriendica2012-05-011-0/+1
| * really fat fingers today - though none of this has gone further than my own sitefriendica2012-05-011-1/+1
| * another onefriendica2012-05-011-1/+1
| * typofriendica2012-05-011-1/+1
| * first try common friends for visitorsfriendica2012-05-014-1/+86
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-010-0/+0
|/
* improve handling of relative feed url'sfriendica2012-05-011-1/+1
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-015-11/+13
|\
| * More Diabook-dark touch-ups. Should *really* be useable this time...with edi...Thomas Willingham2012-05-012-5/+7
| * modified: images/smiley-thumbsup.gifThomas Willingham2012-05-011-0/+0
| * diabook-themes: small fix at "community pages"-boxtommy tomson2012-05-012-6/+6
* | convert html entities to utf-8 before email header encodingfriendica2012-05-013-194/+202
|/
* link socgraph to zrlsfriendica2012-05-012-25/+21
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-012-9/+11
|\
| * Merge pull request #281 from simonlnu/masterSimon2012-05-012-9/+11
| |\
| | * lighten bg and darken font on dispy lightSimon L'nu2012-05-012-9/+11
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-010-0/+0
| |/
* / adding zrl support to social graphsfriendica2012-05-015-18/+39
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-3027-84/+119
|\
| * Merge pull request #280 from simonlnu/masterSimon2012-04-305-15/+9
| |\
| | * sub-minor change to head.tplSimon L'nu2012-05-011-1/+1
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0134-462/+1041
| | |\ | | |/ | |/|
| * | diabook-themes: add "community profiles"-box to right_columntommy tomson2012-05-0122-69/+110
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-3018-1821/+1750
| | |\
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2929-144/+238
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-284-134/+149
| | |\ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2810-445/+548
| | |\ \ \ \ \
| | * | | | | | fix #search-textSimon L'nu2012-04-274-14/+8
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
* | | | | | | | hidden plugins (add .hidden file to dir)friendica2012-04-307-12/+111
|/ / / / / / /
* | | | | | | Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-apifriendica2012-04-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | change api.php in function api_item_get_user to check if $usercache is NULL b...Zach Prezkuta2012-04-301-1/+1
|/ / / / / / /