| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 48 | -68/+6345 |
| |\ | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| | * | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 9 | -11/+52 |
| | |\ | | | | | | | fixes in diabook-derivates | ||||
| | | * | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 9 | -11/+52 |
| | | | | |||||
| | * | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | 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 diabook-derivates | ||||
| | | * | 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 |
| |/ / | |||||
| * | | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style ↵ | Simon L'nu | 2012-03-09 | 7 | -5/+25 |
| | | | | | | | | | | | | | label elemnts. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | i consider dispy pretty stable at this point, so i'm removing the ↵ | Simon L'nu | 2012-03-09 | 1 | -0/+0 |
| | | | | | | | | | | | | | experimental file Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 10 | -37/+19 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: removed info add info fixed star-bug More improved transparency for smilies removed dolphin file (wtf?) . * master: | ||||
| | * | | Merge pull request #112 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -14/+0 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | removed info | tommy tomson | 2012-03-09 | 2 | -14/+0 |
| | | | | |||||
| | * | | Merge pull request #111 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -0/+14 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | add info | tommy tomson | 2012-03-09 | 2 | -0/+14 |
| | | | | |||||
| | * | | Merge pull request #110 from tomtom84/master | tomtom84 | 2012-03-08 | 10 | -37/+19 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | 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 | 52 | -6/+2976 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme info file for testbubble catalan translation revup add theme diabook-blue, fix css * master: | ||||
| | * | | theme info file for testbubble | friendica | 2012-03-08 | 1 | -0/+9 |
| | | | | |||||
| | * | | 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 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | Merge pull request #107 from tomtom84/master | tomtom84 | 2012-03-08 | 5 | -6/+101 |
| |\ \ \ | |/ / |/| / | |/ | fixes in theme diabook | ||||
| | * | 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> | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |