| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | | 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 |
| | | * | | first commit for dispy New Edition | Simon L'nu | 2012-03-03 | 16 | -1752/+3924 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 3 | -1/+21 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 17 | -12/+19 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 2 | -14/+34 |
| | | |\ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 20 | -186/+404 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | minor formatting issues | Simon L'nu | 2012-03-02 | 1 | -12/+7 |
| | | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 0 | -0/+0 |
| | * | | | | | | | Merge pull request #72 from tomtom84/master | tomtom84 | 2012-03-03 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | | * | | | | | | tag fix | tommy tomson | 2012-03-04 | 1 | -1/+2 |
| | * | | | | | | | Merge pull request #71 from tomtom84/master | tomtom84 | 2012-03-03 | 1 | -2/+2 |
| | |\| | | | | | |
|
| | | * | | | | | | fix | tommy tomson | 2012-03-03 | 1 | -2/+2 |
| | * | | | | | | | Merge pull request #70 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -6/+18 |
| | |\| | | | | |
| | |_|_|_|_|/
| |/| | | | | |
|
| | | * | | | | | navbar fix | tommy tomson | 2012-03-03 | 5 | -6/+18 |
| | * | | | | | | Merge pull request #69 from abinoam/docblox | Abinoam P. Marques Jr. | 2012-03-03 | 1 | -0/+13 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Added docblox default configuration file. | Abinoam P. Marques Jr | 2012-03-03 | 1 | -0/+13 |
| | |/ / / / / / |
|
| | * | | | | / | Merge pull request #68 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -1/+8 |
| | |\| | | | |
| | |_|_|_|/
| |/| | | | |
|
| | | * | | | | fixed apps css | tommy tomson | 2012-03-03 | 2 | -1/+8 |
| | * | | | | | Merge pull request #67 from tomtom84/master | tomtom84 | 2012-03-03 | 7 | -10/+17 |
| | |\| | | | |
|
| | | * | | | | fixed star/unstar | tommy tomson | 2012-03-03 | 7 | -10/+17 |
| | * | | | | | Merge pull request #66 from tomtom84/master | tomtom84 | 2012-03-03 | 11 | -2/+2 |
| | |\| | | |
| | |_|_|/
| |/| | | |
|
| | | * | | | fixed admin | tommy tomson | 2012-03-03 | 11 | -2/+2 |
| | * | | | | Merge pull request #65 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -14/+34 |
| | |\| | |
| | |_|/
| |/| | |
|
| | | * | | fix editor | tommy tomson | 2012-03-03 | 2 | -14/+34 |
