| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #115 from tomtom84/master | tomtom84 | 2012-03-09 | 6 | -86/+23 |
| |\ |
|
| | * | 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 '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. style label... | Simon L'nu | 2012-03-09 | 7 | -5/+25 |
| * | | | | 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 authen... | friendica | 2012-03-09 | 2 | -23/+9 |
| |/ / / |
|
| * | | | 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 |
| |\| | |
|
| | * | | i consider dispy pretty stable at this point, so i'm removing the experimenta... | Simon L'nu | 2012-03-09 | 1 | -0/+0 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 13 | -37/+19 |
| | |\ \
| |/ /
|/| | |
|
| * | | | Merge pull request #112 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -14/+0 |
| |\ \ \
| | |/
| |/| |
|
| | * | | removed info | tommy tomson | 2012-03-09 | 2 | -14/+0 |
| * | | | Merge pull request #111 from tomtom84/master | tomtom84 | 2012-03-08 | 2 | -0/+14 |
| |\| | |
|
| | * | | add info | tommy tomson | 2012-03-09 | 2 | -0/+14 |
| * | | | Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e... | friendica | 2012-03-08 | 3 | -0/+0 |
| |\ \ \ |
|
| | * | | | 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 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | 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 |
| | | | |\
| |_|_|/
|/| | | |
|
| * | | | | 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 |
| | | | * | 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 | Simon L'nu | 2012-03-08 | 6 | -10/+358 |
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-08 | 7 | -7/+109 |
| | | | | |\
| | | | |/
| | | |/| |
|
| | | | * | | Merge pull request #107 from tomtom84/master | tomtom84 | 2012-03-08 | 5 | -6/+101 |
| | |_|/| |
|/| |/ /
| |/| | |
|
| | * | | | 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 array_key_exist... | friendica | 2012-03-07 | 1 | -1/+1 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 0 | -0/+0 |
| | |_|/
|/| | |
|
| * | | | 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 jot.tpl buttons. fix up subsequent styling breakage | Simon L'nu | 2012-03-07 | 2 | -56/+75 |
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 0 | -0/+0 |
| | |/ / / |
|
| | * | | | 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 | Simon L'nu | 2012-03-07 | 3 | -44/+35 |
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-07 | 2 | -3/+8 |
| | | |\ \ \
| | |/ / /
| |/| | | |
|
| | * | | | | Merge pull request #103 from tomtom84/master | tomtom84 | 2012-03-06 | 2 | -3/+8 |
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | * | | | 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 |
| | | | |\ \
| | |_|/ /
| |/| | | |
|
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 18 | -0/+0 |
| | | | |\ \ |
|
