aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #80 from unary/darkzeroSimon2012-03-041-0/+8
|\ | | | | improved contrast in acl selector, and preview (darkzero)
| * 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
|\ \ | | | | | | say hello to dispy's younger brother
| * | more ui thingies with dispy - we'll get you well dispy, we promiseSimon L'nu2012-03-041-6/+24
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-24/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixes in diabook unused replacement variable displays %1 in all html2bbcode 'code' blocks revup style.css fix * master:
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: * master:
* | | Merge branch 'pull'friendica2012-03-043-22/+25
|\ \ \ | | |/ | |/|
| * | Merge pull request #81 from tomtom84/mastertomtom842012-03-043-22/+25
| |\ \ | | | | | | | | fixes in diabook theme
| | * | 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 ↵friendica2012-03-042-1/+25
|/ / / | | | | | | | | | misplaced in editplain mode
* | | 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
| |\ \ | | | | | | | | more UI fixes
| | * | removed extra padding/border on tread-wrapper (heh, tea read :P)Simon L'nu2012-03-041-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge pull request #78 from simonlnu/masterSimon2012-03-042-10/+49
| |\ \ | | | | | | | | fix ui issue with toolbar and notification icons
| | * | fix up toolbar so the notifications line up better togetherSimon L'nu2012-03-042-10/+49
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge pull request #77 from simonlnu/masterSimon2012-03-042-29/+32
| |\ \ | | | | | | | | CSS and JS tweaks
| | * | more tweakage. stylesheet and jot-headerSimon L'nu2012-03-042-29/+32
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ / | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revup * master:
* / / revupfriendica2012-03-041-1/+1
|/ /
* | Merge branch 'pull'friendica2012-03-0449-1974/+4574
|\ \
| * \ Merge pull request #76 from simonlnu/masterSimon2012-03-041-5/+8
| |\ \ | | | | | | | | minor ui things
| | * | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxesSimon L'nu2012-03-041-5/+8
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge pull request #75 from simonlnu/masterSimon2012-03-042-7/+37
| |\ \ | | | | | | | | theme tweaks
| | * | tweak wall items a bit (nasty-looking wall items...). jot-header tries to ↵Simon L'nu2012-03-042-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | count chars and fails :P Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-15/+137
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: some fixes in diabook * master:
| * | | Merge pull request #74 from tomtom84/mastertomtom842012-03-035-15/+137
| |\ \ \ | | | |/ | | |/| fixes in diabook theme
| | * | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: tag fix fix navbar fix * master:
| * | Merge pull request #73 from simonlnu/masterSimon2012-03-0319-1767/+3934
| |\ \ | | | | | | | | dispy! (and minor formatting)
| | * | these are more finessing on formatting againSimon L'nu2012-03-032-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | first commit for dispy New EditionSimon L'nu2012-03-0316-1752/+3924
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-033-1/+21
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Added docblox default configuration file. fixed apps css * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0317-12/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-032-14/+34
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix editor * master:
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0320-186/+404
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master:
| | * | | | | | minor formatting issuesSimon L'nu2012-03-021-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix @mention autocomplete in comments template proc: fix variables regexp * master:
| * | | | | | | Merge pull request #72 from tomtom84/mastertomtom842012-03-031-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | fixes in diabook theme
| | * | | | | | tag fixtommy tomson2012-03-041-1/+2
| | | | | | | |
| * | | | | | | Merge pull request #71 from tomtom84/mastertomtom842012-03-031-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | fixes in diabook theme
| | * | | | | | fixtommy tomson2012-03-031-2/+2
| | | | | | | |
| * | | | | | | Merge pull request #70 from tomtom84/mastertomtom842012-03-035-6/+18
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | fixes in diabook theme
| | * | | | | 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.