| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | | More improved transparency for smilies | Thomas | 2012-03-09 | 3 | -0/+0 |
| | | | | | |||||
| | * | | | removed dolphin file (wtf?) | Thomas | 2012-03-07 | 1 | -7/+0 |
| | | | | | |||||
| | * | | | . | Thomas | 2012-03-07 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | 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 | 68 | -7/+10831 |
| | | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 branch 'pull' | friendica | 2012-03-08 | 54 | -11/+3067 |
| |\ \ \ \ | |||||
| | * | | | | 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 |
| | | | | | | |||||
| * | | | | | revup | friendica | 2012-03-08 | 1 | -1/+1 |
| |/ / / / | |||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | | | * | Merge pull request #108 from simonlnu/master | Simon | 2012-03-08 | 6 | -10/+358 |
| | | | |\ | | | | | | | | | | | make svg from notifications.svg to ease future editing. more dispy tweaks | ||||
| | | | | * | 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 branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 7 | -7/+109 |
| | | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add links to /profiles, add some icons to diabook/icons, fixes in css Update README reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) * master: | ||||
| | | | * | | 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 |
| | | | | | |||||
| * | | | | Update README | friendica | 2012-03-08 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | reworked fix from unary for bug #323 (due to incorrect use of ↵ | friendica | 2012-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | array_key_exists()) | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 0 | -0/+0 |
| | |_|/ |/| | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: still getting parent relays on remote systems revup * master: | ||||
| * | | | still getting parent relays on remote systems | friendica | 2012-03-07 | 3 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'pull' | friendica | 2012-03-07 | 5 | -100/+115 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #105 from simonlnu/master | Simon | 2012-03-07 | 2 | -56/+75 |
| | |\ \ \ | | | | | | | | | | | fix dispy breakage in jot.tpl | ||||
| | | * | | | 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> | ||||
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 0 | -0/+0 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | Merge pull request #104 from simonlnu/master | Simon | 2012-03-07 | 3 | -44/+35 |
| | |\ \ \ | | | | | | | | | | | push fix for funky menu action. the overflow-x might break again for some people | ||||
| | | * | | | 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', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 2 | -3/+8 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix in navbar * master: | ||||
| | * | | | | 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 branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 3 | -9/+80 |
| | | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix photos after permissions_sql change [privacy] rework latest fix remove stray debugging * master: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 18 | -0/+0 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: improved smiley transparency * master: | ||||
| | | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 1 | -0/+4 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix in navbar * master: | ||||
| | | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | | | | | | revup | friendica | 2012-03-07 | 2 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | fix photos after permissions_sql change | friendica | 2012-03-06 | 3 | -6/+78 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'pull' | friendica | 2012-03-06 | 23 | -2/+6 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge pull request #102 from beardy-unixer/master | Simon | 2012-03-06 | 18 | -0/+0 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | Improved transparency smileys | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |