| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-09 | 88 | -190/+11452 |
| |\ |
|
| | * | Merge branch 'pull' | friendica | 2012-03-09 | 7 | -5/+25 |
| | |\ |
|
| | | * | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label... | Simon L'nu | 2012-03-09 | 7 | -5/+25 |
| | * | | bug #324 - tinymce used for mail even if editplain being used. | friendica | 2012-03-09 | 1 | -48/+31 |
| | |/ |
|
| | * | i consider dispy pretty stable at this point, so i'm removing the experimenta... | Simon L'nu | 2012-03-09 | 1 | -0/+0 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 10 | -37/+19 |
| | |\ |
|
| | | * | Merge pull request #112 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -14/+0 |
| | | |\ |
|
| | | | * | removed info | tommy tomson | 2012-03-09 | 2 | -14/+0 |
| | | * | | Merge pull request #111 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -0/+14 |
| | | |\| |
|
| | | | * | add info | tommy tomson | 2012-03-09 | 2 | -0/+14 |
| | | * | | Merge pull request #110 from tomtom84/master | tomtom84 | 2012-03-08 | 10 | -37/+19 |
| | | |\| |
|
| | | | * | fixed star-bug | tommy tomson | 2012-03-09 | 10 | -37/+19 |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 67 | -6/+10830 |
| | |\| | |
|
| | | * | | theme info file for testbubble | friendica | 2012-03-08 | 1 | -0/+9 |
| | | * | | catalan translation | friendica | 2012-03-08 | 15 | -0/+7854 |
| | | * | | 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 |
| | * | | | make svg from notifications.svg to ease future editing. more dispy tweaks | Simon L'nu | 2012-03-08 | 6 | -10/+358 |
| | * | | | Merge pull request #107 from tomtom84/master | tomtom84 | 2012-03-08 | 5 | -6/+101 |
| | |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | | * | 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 |
| | * | | push fix for funky menu action. the overflow-x might break again for some people | Simon L'nu | 2012-03-07 | 3 | -44/+35 |
| * | | | 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 |
| | |\ |
|
