aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-0343-493/+697
|\
| * diabook-theme: small fixtommy tomson2012-05-032-2/+4
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-0229-57/+123
| |\
| | * diabook-theme: small fixtommy tomson2012-05-031-0/+1
| | * diabook-theme: made boxes at right_aside sortabletommy tomson2012-05-0329-57/+122
| * | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnso...friendica2012-05-021-5/+33
| |/
| * use cid rather than uid in permsfriendica2012-05-021-3/+12
| * Merge pull request #283 from fermionic/private-events-post-correctly-in-diasporafriendica2012-05-021-0/+19
| |\
| | * Modify events_post() in mod/events.php to set the `private` field to true whe...Zach Prezkuta2012-05-021-0/+19
| |/
| * use mysql replace on cache itemsfriendica2012-05-021-12/+30
| * fixing common friendsfriendica2012-05-021-6/+7
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-027-396/+418
| |\
| | * Merge pull request #282 from max-weller/masterfriendica2012-05-023-1/+9
| | |\
| | | * Moved Meta Viewport from global head.tpl to diabook's headerMax Weller2012-05-023-1/+9
| | |/
| | * 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
| * | rev updatefriendica2012-05-022-5/+12
| |/
| * 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 remote branch 'upstream/master'zottel2012-05-0220-249/+383
|\|
| * 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
| * 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 remote branch 'upstream/master'zottel2012-05-0185-2812/+3625
|\|
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-3027-84/+119
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 08:09:53 +0000