Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-08 | 54 | -11/+3067 |
|\ | |||||
| * | add theme diabook-blue, fix css | tommy tomson | 2012-03-08 | 51 | -6/+2967 |
| | | |||||
| * | add links to /profiles, add some icons to diabook/icons, fixes in css | tommy tomson | 2012-03-08 | 5 | -6/+101 |
| | | |||||
* | | fix jot.tpl buttons. fix up subsequent styling breakage | Simon L'nu | 2012-03-07 | 2 | -56/+75 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | push fix for funky menu action. the overflow-x might break again for some people | Simon L'nu | 2012-03-07 | 3 | -44/+35 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge pull request #103 from tomtom84/master | tomtom84 | 2012-03-06 | 2 | -3/+8 |
|\| | | | | | fixes in theme diabook | ||||
| * | fix in navbar | tommy tomson | 2012-03-07 | 2 | -3/+8 |
| | | |||||
* | | Merge pull request #101 from tomtom84/master | tomtom84 | 2012-03-06 | 1 | -0/+4 |
|\ \ | | | | | | | fixes in theme diabook | ||||
| * | | fix in navbar | tommy tomson | 2012-03-07 | 1 | -0/+4 |
| |/ | |||||
* | | Merge pull request #99 from tomtom84/master | Simon | 2012-03-06 | 4 | -21/+21 |
|\| | | | | | fixes in theme diabook | ||||
| * | messages-menu translation, add scroll-to-top and theme-bug-report in theme | tommy tomson | 2012-03-07 | 4 | -21/+21 |
| | | |||||
* | | dispy, dispy, oh what a little lispy | Simon L'nu | 2012-03-06 | 1 | -19/+18 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | styling fixes in dispy. fix typos in settings.tpl | Simon L'nu | 2012-03-06 | 1 | -36/+35 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | quattro: theme settings (a bit hackish) | Fabio Comuni | 2012-03-06 | 2 | -0/+57 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-03-06 | 6 | -55/+58 |
|\ | |||||
| * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -1/+2 |
| |\ | |||||
| | * | changed bg color around comment box from white to match page background, ↵ | Michael Johnston | 2012-03-05 | 1 | -1/+2 |
| | | | | | | | | | | | | improved contrast on comment preview (darkzero) | ||||
| * | | some admin page fixes and cleanup | friendica | 2012-03-05 | 1 | -0/+2 |
| |/ | |||||
| * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -2/+2 |
| |\ | |||||
| | * | forgot a small change in .field_help | Simon L'nu | 2012-03-05 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | some testbubble stuff | friendica | 2012-03-05 | 3 | -31/+37 |
| |/ | |||||
| * | implement more of the changes requested | Simon L'nu | 2012-03-05 | 1 | -22/+16 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fixes in diabook | tommy tomson | 2012-03-06 | 6 | -4/+16 |
| | | |||||
* | | fixes | tommy tomson | 2012-03-05 | 4 | -5/+26 |
|/ | |||||
* | multiple fixes; the jot-header works as standalone, not sure what's up. | Simon L'nu | 2012-03-05 | 4 | -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'nu | 2012-03-05 | 1 | -2/+3 |
| | | | | | | sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | still working on jot-header. amending <aside> and other elements | Simon L'nu | 2012-03-05 | 2 | -18/+14 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | hopefully fix the overflow issue everywhere this time | Simon L'nu | 2012-03-05 | 1 | -2/+3 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | $name appearing on testbubble items | friendica | 2012-03-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -14/+23 |
|\ | |||||
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 3 | -7/+7 |
| |\ | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: like dislike button fixes in diabook * master: | ||||
| * | | yet more ui things, and bug fixing | Simon L'nu | 2012-03-05 | 1 | -14/+23 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | testbubble notifications | friendica | 2012-03-05 | 3 | -6/+13 |
| |/ |/| | |||||
* | | Merge pull request #83 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -7/+7 |
|\ \ | |/ |/| | fixes in diabook theme | ||||
| * | like dislike button | tommy tomson | 2012-03-05 | 2 | -0/+0 |
| | | |||||
| * | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -21/+25 |
| | | |||||
* | | Merge pull request #80 from unary/darkzero | Simon | 2012-03-04 | 1 | -0/+8 |
|\ \ | | | | | | | improved contrast in acl selector, and preview (darkzero) | ||||
| * | | improved contrast in acl selector, and preview (darkzero) | Michael Johnston | 2012-03-04 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #82 from simonlnu/master | Simon | 2012-03-04 | 1 | -6/+24 |
|\ \ \ | | | | | | | | | say hello to dispy's younger brother | ||||
| * | | | more ui thingies with dispy - we'll get you well dispy, we promise | Simon L'nu | 2012-03-04 | 1 | -6/+24 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | Merge branch 'pull' | friendica | 2012-03-04 | 3 | -22/+25 |
|\| | | | |||||
| * | | | Merge pull request #81 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -22/+25 |
| |\ \ \ | | |/ / | |/| | | fixes in diabook theme | ||||
| | * | | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -14/+18 |
| | |/ | |||||
| | * | style.css fix | tommy tomson | 2012-03-04 | 1 | -10/+9 |
| | | | |||||
* | | | wrap title and text for editplain in zero and TB themes | friendica | 2012-03-04 | 3 | -5/+6 |
| | | | |||||
* | | | correct owner info from misconfigured installs, duepuntozero title block ↵ | friendica | 2012-03-04 | 1 | -1/+1 |
|/ / | | | | | | | misplaced in editplain mode | ||||
* | | removed extra padding/border on tread-wrapper (heh, tea read :P) | Simon L'nu | 2012-03-04 | 1 | -5/+6 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fix up toolbar so the notifications line up better together | Simon L'nu | 2012-03-04 | 2 | -10/+49 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | more tweakage. stylesheet and jot-header | Simon L'nu | 2012-03-04 | 2 | -29/+32 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes | Simon L'nu | 2012-03-04 | 1 | -5/+8 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> |