| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | merged | Alexander Kampmann | 2012-03-07 | 112 | -2723/+7901 |
| |\ |
|
| | * | Merge branch 'pull' | friendica | 2012-03-05 | 5 | -57/+67 |
| | |\ |
|
| | | * | Merge pull request #88 from simonlnu/master | Simon | 2012-03-05 | 4 | -37/+49 |
| | | |\ |
|
| | | | * | multiple fixes; the jot-header works as standalone, not sure what's up. | Simon L'nu | 2012-03-05 | 4 | -37/+49 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #87 from simonlnu/master | Simon | 2012-03-05 | 2 | -3/+4 |
| | | |\ |
|
| | | | * | tweak sizing of <section> and <aside> more; fix link in 'view contacts' in si... | Simon L'nu | 2012-03-05 | 2 | -3/+4 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #86 from simonlnu/master | Simon | 2012-03-05 | 2 | -18/+14 |
| | | |\ |
|
| | | | * | still working on jot-header. amending <aside> and other elements | Simon L'nu | 2012-03-05 | 2 | -18/+14 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #85 from simonlnu/master | Simon | 2012-03-05 | 1 | -2/+3 |
| | | |\ |
|
| | | | * | hopefully fix the overflow issue everywhere this time | Simon L'nu | 2012-03-05 | 1 | -2/+3 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | * / | revup | friendica | 2012-03-05 | 1 | -1/+1 |
| | |/ |
|
| | * | $name appearing on testbubble items | friendica | 2012-03-05 | 1 | -1/+1 |
| | * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -14/+23 |
| | |\ |
|
| | | * | Merge pull request #84 from simonlnu/master | Simon | 2012-03-04 | 1 | -14/+23 |
| | | |\ |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 3 | -7/+7 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | yet more ui things, and bug fixing | Simon L'nu | 2012-03-05 | 1 | -14/+23 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | * | | | testbubble notifications | friendica | 2012-03-05 | 3 | -6/+13 |
| | |/ / |
|
| | * | | Merge pull request #83 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -7/+7 |
| | |\ \
| | |/
| |/| |
|
| | | * | like dislike button | tommy tomson | 2012-03-05 | 2 | -0/+0 |
| | | * | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -21/+25 |
| | * | | Merge pull request #80 from unary/darkzero | Simon | 2012-03-04 | 1 | -0/+8 |
| | |\ \ |
|
| | | * | | improved contrast in acl selector, and preview (darkzero) | Michael Johnston | 2012-03-04 | 1 | -0/+8 |
| | * | | | Merge pull request #82 from simonlnu/master | Simon | 2012-03-04 | 1 | -6/+24 |
| | |\ \ \ |
|
| | | * | | | more ui thingies with dispy - we'll get you well dispy, we promise | Simon L'nu | 2012-03-04 | 1 | -6/+24 |
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 5 | -24/+27 |
| | | |\ \ \ |
|
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | | | |/ /
| | |/| | |
|
| | * | | | | Merge branch 'pull' | friendica | 2012-03-04 | 3 | -22/+25 |
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | * | | | Merge pull request #81 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -22/+25 |
| | | |\ \ \ |
|
| | | | * | | | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -14/+18 |
| | | | | |/
| | | |/| |
|
| | | | * | | style.css fix | tommy tomson | 2012-03-04 | 1 | -10/+9 |
| | * | | | | wrap title and text for editplain in zero and TB themes | friendica | 2012-03-04 | 3 | -5/+6 |
| | * | | | | correct owner info from misconfigured installs, duepuntozero title block misp... | friendica | 2012-03-04 | 2 | -1/+25 |
| | |/ / / |
|
| | * | | | unused replacement variable displays %1 in all html2bbcode 'code' blocks | friendica | 2012-03-04 | 1 | -1/+1 |
| | * | | | Merge branch 'pull' | friendica | 2012-03-04 | 3 | -44/+87 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | Merge pull request #79 from simonlnu/master | Simon | 2012-03-04 | 1 | -5/+6 |
| | | |\ \ |
|
| | | | * | | removed extra padding/border on tread-wrapper (heh, tea read :P) | Simon L'nu | 2012-03-04 | 1 | -5/+6 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | | |/ / |
|
| | | * | | Merge pull request #78 from simonlnu/master | Simon | 2012-03-04 | 2 | -10/+49 |
| | | |\ \ |
|
| | | | * | | fix up toolbar so the notifications line up better together | Simon L'nu | 2012-03-04 | 2 | -10/+49 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | | |/ / |
|
| | | * | | Merge pull request #77 from simonlnu/master | Simon | 2012-03-04 | 2 | -29/+32 |
| | | |\ \ |
|
| | | | * | | more tweakage. stylesheet and jot-header | Simon L'nu | 2012-03-04 | 2 | -29/+32 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | | |/ / |
|
| | * / / | revup | friendica | 2012-03-04 | 1 | -1/+1 |
| | |/ / |
|
| | * | | Merge branch 'pull' | friendica | 2012-03-04 | 49 | -1974/+4574 |
| | |\ \ |
|
