aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| * | | 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 '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-041-1/+1
| |/ /
| * | removed extra padding/border on tread-wrapper (heh, tea read :P)Simon L'nu2012-03-041-5/+6
| * | fix up toolbar so the notifications line up better togetherSimon L'nu2012-03-042-10/+49
| * | more tweakage. stylesheet and jot-headerSimon L'nu2012-03-042-29/+32
| * | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxesSimon L'nu2012-03-041-5/+8
| * | tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou...Simon L'nu2012-03-042-7/+37
| * | Merge pull request #74 from tomtom84/mastertomtom842012-03-035-15/+137
| |\|
| | * some fixes in diabooktommy tomson2012-03-045-15/+137
| * | 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-032-1/+8
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0315-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-0318-184/+402
| | |\ \ \ \ \
| | * | | | | | minor formatting issuesSimon L'nu2012-03-021-12/+7
| * | | | | | | 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 #68 from tomtom84/mastertomtom842012-03-032-1/+8
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | fixed apps csstommy tomson2012-03-032-1/+8
| * | | | | Merge pull request #67 from tomtom84/mastertomtom842012-03-035-10/+17
| |\| | | |
| | * | | | fixed star/unstartommy tomson2012-03-035-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
| * | | Merge pull request #63 from tomtom84/mastertomtom842012-03-023-1/+5
| |\| |
| | * | small fix in style.csstommy tomson2012-03-031-1/+5