| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 57 | -384/+1152 |
| |\ | |||||
| | * | commit latest to dispy-dark. fixes in html css and js | Simon L'nu | 2012-03-15 | 15 | -83/+113 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-15 | 10 | -21/+74 |
| | |\ | |||||
| | | * | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 10 | -21/+74 |
| | | | | |||||
| | * | | Merge pull request #133 from tonybaldwin/master | friendica | 2012-03-14 | 2 | -0/+102 |
| | |\ \ | | | | | | | | | slack-NS | ||||
| | | * | | added slack-NS, non-scrolly, slackr-based theme. | Tony Baldwin | 2012-03-13 | 2 | -0/+102 |
| | | | | | |||||
| | * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-14 | 7 | -7/+189 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #134 from simonlnu/master | Simon | 2012-03-14 | 21 | -131/+307 |
| | | |\ \ \ | | | |_|/ | | |/| | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 | ||||
| | | * | | | fix in nav | tommy tomson | 2012-03-14 | 1 | -4/+0 |
| | | | | | | |||||
| | | * | | | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 6 | -3/+189 |
| | | | | | | |||||
| | * | | | | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 |
| | |\ \ \ \ | | | |/ / | | |/| | | massive work done to both dispys, mostly -dark | ||||
| | | * | | | massive work done to both dispys, mostly -dark | Simon L'nu | 2012-03-14 | 9 | -128/+247 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * / | | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 3 | -4/+9 |
| | |/ / | |||||
| | * | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 4 | -3/+21 |
| | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | ||||
| | * | | click anywhere to close notifications -> zeros and bubbles | friendica | 2012-03-12 | 8 | -0/+39 |
| | |/ | |||||
| | * | 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> | ||||
| * | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | | | |||||
| * | | | 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: | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |