| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | 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 |
| | | | | |||||
| | | * | add links to /profiles, add some icons to diabook/icons, fixes in css | tommy tomson | 2012-03-08 | 5 | -6/+101 |
| | | | | |||||
| * | | | revup | friendica | 2012-03-08 | 1 | -1/+1 |
| |/ / | |||||
| * | | 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()) | ||||
| * | | 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 | ||||
| | | * | | | Merge remote-tracking branch 'upstream/master' | Thomas | 2012-03-06 | 18 | -222/+359 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: images/smiley-beard.png | ||||
| | * | | | | 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 #100 from simonlnu/master | Simon | 2012-03-06 | 5 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png | ||||
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 6 | -7/+15 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master: | ||||
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 13 | -38/+70 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: search should be ok, but a little extra security won't hurt messages-menu translation, add scroll-to-top and theme-bug-report in theme Fixed...merged with mainline THEN added beards. added beard smileys doc/Account-Basics.md doc/Account-Basics.md a doc/Remove-Account.md doc/Making-Friends.md doc/Bugs-and-Issues.md doc/Account-Basics.md * master: | ||||
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: string update [PRIVACY] privacy issue bug #314 * master: | ||||
| | | | | | * | improved smiley transparency | Thomas | 2012-03-06 | 20 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | [privacy] rework latest fix | friendica | 2012-03-06 | 2 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | remove stray debugging | friendica | 2012-03-06 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'pull' | friendica | 2012-03-06 | 12 | -37/+69 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #94 from beardy-unixer/master | Simon | 2012-03-06 | 7 | -16/+45 |
| | |\ \ \ \ | | | |_|/ | | |/| | | Documentation changes | ||||
| | | * | | | Fixed...merged with mainline THEN added beards. | Thomas | 2012-03-06 | 1 | -5/+36 |
| | | | | | | |||||
| | | * | | | added beard smileys | Thomas | 2012-03-06 | 3 | -35/+8 |
| | | | | | | |||||
| | | * | | | doc/Account-Basics.md | Thomas | 2012-03-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | doc/Account-Basics.md | Thomas | 2012-03-06 | 1 | -2/+1 |
| | | | | | | |||||
| | | * | | | a | Thomas | 2012-03-06 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | doc/Remove-Account.md | Thomas | 2012-03-06 | 1 | -2/+13 |
| | | | | | | |||||
| | | * | | | doc/Making-Friends.md | Thomas | 2012-03-06 | 1 | -1/+8 |
| | | | | | | |||||
| | | * | | | doc/Bugs-and-Issues.md | Thomas | 2012-03-06 | 1 | -5/+6 |
| | | | | | | |||||
| | | * | | | doc/Account-Basics.md | Thomas | 2012-03-06 | 1 | -6/+13 |
| | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |