| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 69 | -689/+7698 |
| |\ | | | | | | | | | Conflicts: view/de/strings.php | ||||
| | * | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 6 | -3/+189 |
| | | | |||||
| | * | fix css | tommy tomson | 2012-03-13 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 44 | -1490/+2 |
| | |\ | | | | | | | fixes in diabook-derivates | ||||
| | | * | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 44 | -1490/+2 |
| | | | | |||||
| | * | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 6 | -4/+72 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | fixes | tommy tomson | 2012-03-12 | 6 | -4/+72 |
| | | | | |||||
| | * | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 59 | -45/+1667 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 59 | -45/+1667 |
| | | | | |||||
| | * | | fix dispy-dark photo album stuff | Simon L'nu | 2012-03-11 | 1 | -17/+18 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | fix dispys' css and layout | Simon L'nu | 2012-03-11 | 7 | -130/+147 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | 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> | ||||
| | * | | 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 |
| | |\| | | | | | | | fixes in diabook-derivates | ||||
| | | * | 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 |
| | |\| | | | | | | | 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 |
| | | | | |||||
| * | | | 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 ↵ | Simon L'nu | 2012-03-09 | 7 | -5/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | label elemnts. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | 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 ↵ | 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 | 67 | -6/+10830 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 |
| | | | | | |||||
| | | * | | 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 |
| | | | | | | | | | | | | | | | | | 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 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 |
| | |\| | | | | | | | fixes in theme diabook | ||||
| | | * | fix in navbar | tommy tomson | 2012-03-07 | 2 | -3/+8 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |