| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-07 | 21 | -133/+238 |
| |\ |
|
| | * | Merge pull request #103 from tomtom84/master | tomtom84 | 2012-03-06 | 2 | -3/+8 |
| | |\ |
|
| | | * | 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 |
| | |\ \ |
|
| | | * | | 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 |
| | |\| |
|
| | | * | 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 |
| | * | | bugs #312, #313 | friendica | 2012-03-06 | 1 | -1/+1 |
| | |/ |
|
| | * | styling fixes in dispy. fix typos in settings.tpl | Simon L'nu | 2012-03-06 | 2 | -38/+37 |
| | * | 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 | 8 | -58/+66 |
| | |\ |
|
| | | * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -1/+2 |
| | | |\ |
|
| | | | * | changed bg color around comment box from white to match page background, impr... | Michael Johnston | 2012-03-05 | 1 | -1/+2 |
| | | * | | some admin page fixes and cleanup | friendica | 2012-03-05 | 3 | -3/+10 |
| | | |/ |
|
| | | * | 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 |
| | | * | | 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 |
| | * | | fixes in diabook | tommy tomson | 2012-03-06 | 6 | -4/+16 |
| | * | | fixes | tommy tomson | 2012-03-05 | 4 | -5/+26 |
| | |/ |
|
| * | | merged | Alexander Kampmann | 2012-03-07 | 94 | -2529/+7640 |
| |\| |
|
| | * | multiple fixes; the jot-header works as standalone, not sure what's up. | Simon L'nu | 2012-03-05 | 4 | -37/+49 |
| | * | tweak sizing of <section> and <aside> more; fix link in 'view contacts' in si... | Simon L'nu | 2012-03-05 | 2 | -3/+4 |
| | * | still working on jot-header. amending <aside> and other elements | Simon L'nu | 2012-03-05 | 2 | -18/+14 |
| | * | hopefully fix the overflow issue everywhere this time | Simon L'nu | 2012-03-05 | 1 | -2/+3 |
| | * | $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 |
| | | |\ |
|
| | | * | | yet more ui things, and bug fixing | Simon L'nu | 2012-03-05 | 1 | -14/+23 |
| | * | | | testbubble notifications | friendica | 2012-03-05 | 3 | -6/+13 |
| | | |/
| |/| |
|
| | * | | Merge pull request #83 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -7/+7 |
| | |\ \
| | |/
| |/| |
|
| | | * | 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) | Michael Johnston | 2012-03-04 | 1 | -0/+8 |
| | * | | | Merge pull request #82 from simonlnu/master | Simon | 2012-03-04 | 1 | -6/+24 |
| | |\ \ \ |
|
| | | * | | | more ui thingies with dispy - we'll get you well dispy, we promise | Simon L'nu | 2012-03-04 | 1 | -6/+24 |
| | * | | | | 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 | 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 misp... | friendica | 2012-03-04 | 1 | -1/+1 |
| | |/ / |
|
| | * | | removed extra padding/border on tread-wrapper (heh, tea read :P) | Simon L'nu | 2012-03-04 | 1 | -5/+6 |
| | * | | fix up toolbar so the notifications line up better together | Simon L'nu | 2012-03-04 | 2 | -10/+49 |
| | * | | more tweakage. stylesheet and jot-header | Simon L'nu | 2012-03-04 | 2 | -29/+32 |
| | * | | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes | Simon L'nu | 2012-03-04 | 1 | -5/+8 |
| | * | | tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou... | Simon L'nu | 2012-03-04 | 2 | -7/+37 |
| | * | | Merge pull request #74 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -15/+137 |
| | |\| |
|
