aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
* Merge pull request #85 from simonlnu/masterSimon2012-03-051-2/+3
|\
| * hopefully fix the overflow issue everywhere this timeSimon L'nu2012-03-051-2/+3
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
|/
* $name appearing on testbubble itemsfriendica2012-03-051-1/+1
* Merge branch 'pull'friendica2012-03-051-14/+23
|\
| * Merge pull request #84 from simonlnu/masterSimon2012-03-041-14/+23
| |\
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-053-7/+7
| | |\ | | |/ | |/|
| | * yet more ui things, and bug fixingSimon L'nu2012-03-051-14/+23
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
* | | testbubble notificationsfriendica2012-03-053-6/+13
|/ /
* | Merge pull request #83 from tomtom84/mastertomtom842012-03-043-7/+7
|\ \ | |/ |/|
| * like dislike buttontommy tomson2012-03-052-0/+0
| * fixes in diabooktommy tomson2012-03-053-21/+25
* | Merge pull request #80 from unary/darkzeroSimon2012-03-041-0/+8
|\ \
| * | improved contrast in acl selector, and preview (darkzero)Michael Johnston2012-03-041-0/+8
* | | Merge pull request #82 from simonlnu/masterSimon2012-03-041-6/+24
|\ \ \
| * | | more ui thingies with dispy - we'll get you well dispy, we promiseSimon L'nu2012-03-041-6/+24
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-24/+27
| |\ \ \
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| | |/ / | |/| |
* | | | Merge branch 'pull'friendica2012-03-043-22/+25
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #81 from tomtom84/mastertomtom842012-03-043-22/+25
| |\ \ \
| | * | | fixes in diabooktommy tomson2012-03-053-14/+18
| | | |/ | | |/|
| | * | style.css fixtommy tomson2012-03-041-10/+9
* | | | wrap title and text for editplain in zero and TB themesfriendica2012-03-043-5/+6
* | | | correct owner info from misconfigured installs, duepuntozero title block misp...friendica2012-03-042-1/+25
|/ / /
* | | unused replacement variable displays %1 in all html2bbcode 'code' blocksfriendica2012-03-041-1/+1
* | | Merge branch 'pull'friendica2012-03-043-44/+87
|\ \ \ | | |/ | |/|
| * | Merge pull request #79 from simonlnu/masterSimon2012-03-041-5/+6
| |\ \
| | * | removed extra padding/border on tread-wrapper (heh, tea read :P)Simon L'nu2012-03-041-5/+6
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ /
| * | Merge pull request #78 from simonlnu/masterSimon2012-03-042-10/+49
| |\ \
| | * | fix up toolbar so the notifications line up better togetherSimon L'nu2012-03-042-10/+49
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ /
| * | Merge pull request #77 from simonlnu/masterSimon2012-03-042-29/+32
| |\ \
| | * | more tweakage. stylesheet and jot-headerSimon L'nu2012-03-042-29/+32
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ /
* / / revupfriendica2012-03-041-1/+1
|/ /
* | Merge branch 'pull'friendica2012-03-0449-1974/+4574
|\ \
| * \ Merge pull request #76 from simonlnu/masterSimon2012-03-041-5/+8
| |\ \
| | * | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxesSimon L'nu2012-03-041-5/+8
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ /
| * | Merge pull request #75 from simonlnu/masterSimon2012-03-042-7/+37
| |\ \
| | * | tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou...Simon L'nu2012-03-042-7/+37
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-15/+137
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #74 from tomtom84/mastertomtom842012-03-035-15/+137
| |\ \ \ | | | |/ | | |/|
| | * | some fixes in diabooktommy tomson2012-03-045-15/+137
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-030-0/+0
| | |/ | |/|
| * | Merge pull request #73 from simonlnu/masterSimon2012-03-0319-1767/+3934
| |\ \
| | * | these are more finessing on formatting againSimon L'nu2012-03-032-3/+3