| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| |/ |
|
| * | $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 |
| |\ \ |
|
| | * \ | Merge pull request #76 from simonlnu/master | Simon | 2012-03-04 | 1 | -5/+8 |
| | |\ \ |
|
| | | * | | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes | Simon L'nu | 2012-03-04 | 1 | -5/+8 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | |/ / |
|
| | * | | Merge pull request #75 from simonlnu/master | Simon | 2012-03-04 | 2 | -7/+37 |
| | |\ \ |
|
| | | * | | tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou... | Simon L'nu | 2012-03-04 | 2 | -7/+37 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 5 | -15/+137 |
| | | |\ \
| | |/ /
| |/| | |
|
| | * | | | Merge pull request #74 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -15/+137 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | some fixes in diabook | tommy tomson | 2012-03-04 | 5 | -15/+137 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 0 | -0/+0 |
| | | |/
| |/| |
|
| | * | | Merge pull request #73 from simonlnu/master | Simon | 2012-03-03 | 19 | -1767/+3934 |
| | |\ \ |
|
| | | * | | these are more finessing on formatting again | Simon L'nu | 2012-03-03 | 2 | -3/+3 |
