aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | first commit for dispy New EditionSimon L'nu2012-03-0316-1752/+3924
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-033-1/+21
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0317-12/+19
| | |\ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-032-14/+34
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0320-186/+404
| | |\ \ \ \ \
| | * | | | | | minor formatting issuesSimon L'nu2012-03-021-12/+7
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
| * | | | | | | Merge pull request #72 from tomtom84/mastertomtom842012-03-031-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | tag fixtommy tomson2012-03-041-1/+2
| * | | | | | | Merge pull request #71 from tomtom84/mastertomtom842012-03-031-2/+2
| |\| | | | | |
| | * | | | | | fixtommy tomson2012-03-031-2/+2
| * | | | | | | Merge pull request #70 from tomtom84/mastertomtom842012-03-035-6/+18
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | navbar fixtommy tomson2012-03-035-6/+18
| * | | | | | Merge pull request #69 from abinoam/docbloxAbinoam P. Marques Jr.2012-03-031-0/+13
| |\ \ \ \ \ \
| | * | | | | | Added docblox default configuration file.Abinoam P. Marques Jr2012-03-031-0/+13
| |/ / / / / /
| * | | | | / Merge pull request #68 from tomtom84/mastertomtom842012-03-032-1/+8
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | fixed apps csstommy tomson2012-03-032-1/+8
| * | | | | Merge pull request #67 from tomtom84/mastertomtom842012-03-037-10/+17
| |\| | | |
| | * | | | fixed star/unstartommy tomson2012-03-037-10/+17
| * | | | | Merge pull request #66 from tomtom84/mastertomtom842012-03-0311-2/+2
| |\| | | | | | |_|_|/ | |/| | |
| | * | | fixed admintommy tomson2012-03-0311-2/+2
| * | | | Merge pull request #65 from tomtom84/mastertomtom842012-03-032-14/+34
| |\| | | | | |_|/ | |/| |
| | * | fix editortommy tomson2012-03-032-14/+34
| * | | Merge pull request #64 from tomtom84/mastertomtom842012-03-0310-7/+204
| |\| |
| | * | fix text-editor in themetommy tomson2012-03-0310-7/+204
| * | | german strings as of 28th Feb from transilexTobias Diekershoff2012-03-032-142/+142