| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 2 | -7/+29 |
| |\ | |||||
| | * | Merge pull request #123 from simonlnu/master | Simon | 2012-03-11 | 1 | -1/+1 |
| | |\ | | | | | | | screwed up on the font-size for screen last push | ||||
| | | * | 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> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | Merge pull request #122 from simonlnu/master | Simon | 2012-03-11 | 2 | -1/+14 |
| | |\ | | | | | | | add some '@media handheld' types for dispys | ||||
| | | * | 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> | ||||
| | * | | Merge pull request #121 from simonlnu/master | Simon | 2012-03-11 | 1 | -5/+9 |
| | |\| | | | | | | | fix more stuff | ||||
| | | * | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #120 from simonlnu/master | Simon | 2012-03-11 | 1 | -2/+7 |
| | |\| | | | | | | | fix some stuff right away | ||||
| | | * | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 62 | -559/+7162 |
| |\| | | |||||
| | * | | Merge pull request #119 from simonlnu/master | Simon | 2012-03-10 | 33 | -13/+6144 |
| | |\| | | | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | ||||
| | | * | 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 branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 15 | -494/+883 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master: | ||||
| | * | | bug #328 | friendica | 2012-03-10 | 1 | -3/+3 |
| | | | | |||||
| | * | | default the text template var on conversations | friendica | 2012-03-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 2 | -6/+16 |
| | | | | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-10 | 11 | -484/+862 |
| | |\ \ | |||||
| | | * \ | 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 |
| | | | | | | |||||
| | * | | | | revup | friendica | 2012-03-10 | 1 | -1/+1 |
| | |/ / / | |||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-10 | 8 | -2/+13 |
| | | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: spec directory allow user to set number of items to show on network page revup * master: | ||||
| | * | | | Merge branch 'pull' | friendica | 2012-03-09 | 3 | -1/+12 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #117 from unary/issue299 | friendica | 2012-03-09 | 3 | -1/+12 |
| | | |\ \ \ | | | | | | | | | | | | | allow user to set number of items to show on network page | ||||
| | | | * | | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 3 | -1/+12 |
| | | |/ / / | |||||
| | * | | | | spec directory | friendica | 2012-03-09 | 4 | -0/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'pull' | friendica | 2012-03-09 | 10 | -86/+157 |
| | |\| | | | |||||
| | * | | | | revup | friendica | 2012-03-09 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-09 | 0 | -0/+0 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add js to hide nav-menus, when clicked outside fixes in css recover contacts total count which got lost bug #324 - tinymce used for mail even if editplain being used. bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed keep tony from talking to himself * master: | ||||
| | | * | | 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 |
| | | | | |||||
| | * | | recover contacts total count which got lost | friendica | 2012-03-09 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 252 | -3416/+20704 |
| |\| | | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-09 | 7 | -5/+25 |
| | |\ \ | |||||
| | | * \ | Merge pull request #114 from simonlnu/master | Simon | 2012-03-08 | 7 | -5/+25 |
| | | |\ \ | | | | | | | | | | | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. | ||||
| | | | * | | [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 | 2 | -48/+37 |
| | | | | | | |||||
| | * | | | | bug in check for private email comment to public conversation prevents ↵ | friendica | 2012-03-09 | 2 | -23/+9 |
| | |/ / / | | | | | | | | | | | | | authenticated visitor from seeing comments that should be allowed | ||||
| | * | | | keep tony from talking to himself | friendica | 2012-03-08 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Merge pull request #113 from simonlnu/master | Simon | 2012-03-08 | 7 | -10/+358 |
| | |\| | | | | | | | | | | dispy stable enough to be considered stable IMO | ||||
| | | * | | 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 | 13 | -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 #109 from ↵ | friendica | 2012-03-08 | 3 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5 More improved transparency smileys | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |