| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| | | | |\ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 1 | -0/+4 |
| | | | |\ \ |
|
| | | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 0 | -0/+0 |
| * | | | | | | 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 |
| | |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | | * | | | Merge remote-tracking branch 'upstream/master' | Thomas | 2012-03-06 | 18 | -222/+359 |
| | | |\ \ \
| | |/ / /
| |/| | | |
|
| | * | | | | Merge pull request #101 from tomtom84/master | tomtom84 | 2012-03-06 | 1 | -0/+4 |
| | |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | | * | | | 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 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 6 | -7/+15 |
| | | |\ \ \
| | |/ / /
| |/| | | |
|
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 13 | -38/+70 |
| | | |\ \ \ |
|
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 0 | -0/+0 |
| | | | | | * | 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 |
| | |\ \ \ \
| | | |_|/
| | |/| | |
|
| | | * | | | 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 |
