| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 15 | -494/+883 |
| |\ |
|
| | * | 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 |
| | | |\ |
|
| | | | * | 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 |
| |\| | |
|
| | * | | 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 | 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 |
| | |/ /
|/| | |
|
| * | | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| |\ \ \
| | |/
| |/| |
|
| | * | | 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 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 |
| | | | |\ |
|
