aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0721-133/+238
|\
| * Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
| |\ | | | | | | fixes in theme diabook
| | * fix in navbartommy tomson2012-03-072-3/+8
| | |
| * | Merge pull request #101 from tomtom84/mastertomtom842012-03-061-0/+4
| |\ \ | | | | | | | | fixes in theme diabook
| | * | fix in navbartommy tomson2012-03-071-0/+4
| | |/
| * | Merge pull request #99 from tomtom84/masterSimon2012-03-064-21/+21
| |\| | | | | | | fixes in theme diabook
| | * messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-074-21/+21
| | |
| * | dispy, dispy, oh what a little lispySimon L'nu2012-03-061-19/+18
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | bugs #312, #313friendica2012-03-061-1/+1
| |/
| * styling fixes in dispy. fix typos in settings.tplSimon L'nu2012-03-062-38/+37
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * quattro: theme settings (a bit hackish)Fabio Comuni2012-03-062-0/+57
| |
| * Merge remote-tracking branch 'origin/master'tommy tomson2012-03-068-58/+66
| |\
| | * Merge branch 'pull'friendica2012-03-051-1/+2
| | |\
| | | * changed bg color around comment box from white to match page background, ↵Michael Johnston2012-03-051-1/+2
| | | | | | | | | | | | | | | | improved contrast on comment preview (darkzero)
| | * | some admin page fixes and cleanupfriendica2012-03-053-3/+10
| | |/
| | * Merge branch 'pull'friendica2012-03-051-2/+2
| | |\
| | | * forgot a small change in .field_helpSimon L'nu2012-03-051-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | some testbubble stufffriendica2012-03-053-31/+37
| | |/
| | * implement more of the changes requestedSimon L'nu2012-03-051-22/+16
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | fixes in diabooktommy tomson2012-03-066-4/+16
| | |
| * | fixestommy tomson2012-03-054-5/+26
| |/
* | mergedAlexander Kampmann2012-03-0794-2529/+7640
|\|
| * multiple fixes; the jot-header works as standalone, not sure what's up.Simon L'nu2012-03-054-37/+49
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * tweak sizing of <section> and <aside> more; fix link in 'view contacts' in ↵Simon L'nu2012-03-052-3/+4
| | | | | | | | | | | | sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * still working on jot-header. amending <aside> and other elementsSimon L'nu2012-03-052-18/+14
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * hopefully fix the overflow issue everywhere this timeSimon L'nu2012-03-051-2/+3
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * $name appearing on testbubble itemsfriendica2012-03-051-1/+1
| |
| * Merge branch 'pull'friendica2012-03-051-14/+23
| |\
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-053-7/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: like dislike button fixes in diabook * master:
| | * | yet more ui things, and bug fixingSimon L'nu2012-03-051-14/+23
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | testbubble notificationsfriendica2012-03-053-6/+13
| | |/ | |/|
| * | Merge pull request #83 from tomtom84/mastertomtom842012-03-043-7/+7
| |\ \ | | |/ | |/| fixes in diabook theme
| | * 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)
| | * | 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 '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-041-1/+1
| |/ / | | | | | | | | | misplaced in editplain mode
| * | 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>
| * | 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>
| * | more tweakage. stylesheet and jot-headerSimon L'nu2012-03-042-29/+32
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | 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>
| * | 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 pull request #74 from tomtom84/mastertomtom842012-03-035-15/+137
| |\| | | | | | | fixes in diabook theme
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:55:09 +0000