| Commit message (Expand) | Author | Age | Files | Lines |
* | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 52 | -542/+7157 |
|\ |
|
| * | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 |
| * | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 |
| * | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| * | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| * | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 |
| * | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 1 | -1/+1 |
| * | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 9 | -11/+52 |
| |\ |
|
| | * | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 9 | -11/+52 |
| * | | German translation | Tobias Diekershoff | 2012-03-10 | 2 | -473/+810 |
| * | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 1 | -0/+1 |
| * | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| |\| |
|
| | * | add js to hide nav-menus, when clicked outside | tommy tomson | 2012-03-09 | 5 | -0/+134 |
| * | | Merge pull request #115 from tomtom84/master | tomtom84 | 2012-03-09 | 6 | -86/+23 |
| |\| |
|
| | * | fixes in css | tommy tomson | 2012-03-09 | 6 | -86/+23 |
* | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 1 | -0/+3 |
* | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -2/+2 |
* | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 |
|/ / |
|
* | | 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 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 |