| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #221 from simonlnu/master | Simon | 2012-04-10 | 11 | -268/+278 |
| |\ | |||||
| | * | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | |\ | |/ |/| | |||||
| * | | path to default.php in theme dir was incorrect | friendica | 2012-04-10 | 1 | -2/+2 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 6 | -1067/+1227 |
| | |\ | |/ |/| | |||||
| * | | 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 |
| * | | | | | | rev update | friendica | 2012-04-09 | 2 | -30/+30 |
| | |_|/ / / |/| | | | | |||||
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-09 | 70 | -415/+947 |
| | | | | |\ | | |_|_|/ | |/| | | | |||||
| | * | | | | 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 |
| |/ / / | |||||
| * | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-15 | 10 | -21/+74 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-14 | 8 | -8/+190 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use local_user for tag completion if available. See bug #368 | friendica | 2012-04-09 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |