Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 6 | -1067/+1227 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-09 | 70 | -415/+947 | |
| | |\ \ \ | ||||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-08 | 0 | -0/+0 | |
* | | | | | | set default on get_avatar | friendica | 2012-04-10 | 1 | -1/+8 | |
* | | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 7 | -40/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 6 | -34/+18 | |
| * | | | | | | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 3 | -7/+7 | |
* | | | | | | | rev update | friendica | 2012-04-10 | 2 | -42/+101 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | path to default.php in theme dir was incorrect | friendica | 2012-04-10 | 1 | -2/+2 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'pull' | friendica | 2012-04-09 | 61 | -1063/+1580 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #218 from campino/master | friendica | 2012-04-09 | 5 | -1037/+1197 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | ||||||
| | * | | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 8 | -0/+0 | |
| | |\ \ \ | ||||||
| | * | | | | source beautifarming to make review easier | Alexander Kampmann | 2012-04-09 | 1 | -180/+180 | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 30 | -399/+574 | |
| | |\ \ \ \ | ||||||
| | * | | | | | fixed some typos | Alexander Kampmann | 2012-04-09 | 3 | -6/+6 | |
| | * | | | | | made exceptions from the db optional | Alexander Kampmann | 2012-04-09 | 3 | -872/+918 | |
| | * | | | | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 6 | -188/+302 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge pull request #220 from tomtom84/master | tomtom84 | 2012-04-09 | 40 | -26/+383 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | bbcode toolbar attached to the comment text field | tommy tomson | 2012-04-10 | 40 | -26/+383 | |
| |/ / / / | ||||||
| * | | / | diabook-themes: small icon fix | tommy tomson | 2012-04-09 | 14 | -0/+0 | |
| | |_|/ | |/| | | ||||||
| * | | | Merge pull request #217 from tomtom84/master | tomtom84 | 2012-04-09 | 8 | -0/+0 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | diabook-nav-icons with gradient | tommy tomson | 2012-04-09 | 8 | -0/+0 | |
| |/ / | ||||||
* / / | rev update | friendica | 2012-04-09 | 2 | -30/+30 | |
|/ / | ||||||
* | | Merge branch 'pull' | friendica | 2012-04-09 | 2 | -64/+64 | |
|\ \ | ||||||
| * \ | Merge pull request #216 from zzottel/master | tomtom84 | 2012-04-09 | 2 | -64/+64 | |
| |\ \ | ||||||
| | * | | Some new German translations | zottel | 2012-04-09 | 2 | -64/+64 | |
| | * | | Merge remote branch 'upstream/master' | zottel | 2012-04-09 | 26 | -333/+498 | |
| | |\ \ | ||||||
| | * \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-08 | 22 | -25/+302 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | * | | | Merge remote branch 'upstream/master' | zottel | 2012-04-08 | 1418 | -2297/+4820 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-04 | 70 | -3913/+376 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-03 | 41 | -276/+471 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-02 | 115 | -313/+12740 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-31 | 197 | -1141/+19714 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-30 | 39 | -139/+391 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-29 | 87 | -435/+2071 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-27 | 166 | -1297/+7813 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-24 | 5 | -223/+86 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-23 | 5 | -34/+4953 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-23 | 12 | -34/+375 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-22 | 22 | -20/+349 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-22 | 36 | -65/+552 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-21 | 346 | -10409/+21300 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-20 | 5 | -102/+81 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-19 | 2 | -1/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-19 | 24 | -66/+113 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-18 | 8 | -22/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 3 | -7/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 28 | -306/+488 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-16 | 44 | -170/+547 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-15 | 31 | -274/+1206 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |