aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0868-7/+10831
|\
| * theme info file for testbubblefriendica2012-03-081-0/+9
| * catalan translationfriendica2012-03-0815-0/+7854
| * Merge branch 'pull'friendica2012-03-0854-11/+3067
| |\
| | * Merge https://github.com/friendica/friendica into pullfriendica2012-03-0854-11/+3067
| | |\
| | | * add theme diabook-blue, fix csstommy tomson2012-03-0851-6/+2967
| * | | revupfriendica2012-03-081-1/+1
| |/ /
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-080-0/+0
* | | Merge pull request #108 from simonlnu/masterSimon2012-03-086-10/+358
|\ \ \
| * | | make svg from notifications.svg to ease future editing. more dispy tweaksSimon L'nu2012-03-086-10/+358
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-087-7/+109
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #107 from tomtom84/mastertomtom842012-03-085-6/+101
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | add links to /profiles, add some icons to diabook/icons, fixes in csstommy tomson2012-03-085-6/+101
* | | Update READMEfriendica2012-03-081-0/+7
* | | reworked fix from unary for bug #323 (due to incorrect use of array_key_exist...friendica2012-03-071-1/+1
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-070-0/+0
| |/ |/|
* | still getting parent relays on remote systemsfriendica2012-03-073-3/+4
* | Merge branch 'pull'friendica2012-03-075-100/+115
|\ \
| * \ Merge pull request #105 from simonlnu/masterSimon2012-03-072-56/+75
| |\ \
| | * | fix jot.tpl buttons. fix up subsequent styling breakageSimon L'nu2012-03-072-56/+75
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-070-0/+0
| |/ /
| * | Merge pull request #104 from simonlnu/masterSimon2012-03-073-44/+35
| |\ \
| | * | push fix for funky menu action. the overflow-x might break again for some peopleSimon L'nu2012-03-073-44/+35
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-072-3/+8
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
| |\ \ \ | | | |/ | | |/|
| | * | fix in navbartommy tomson2012-03-072-3/+8
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-063-9/+80
| | | |\ | | |_|/ | |/| |
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0618-0/+0
| | | |\
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-061-0/+4
| | | |\ \
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
* | | | | | revupfriendica2012-03-072-2/+2
|/ / / / /
* | | | | fix photos after permissions_sql changefriendica2012-03-063-6/+78
* | | | | Merge branch 'pull'friendica2012-03-0623-2/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #102 from beardy-unixer/masterSimon2012-03-0618-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge remote-tracking branch 'upstream/master'Thomas2012-03-0618-222/+359
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #101 from tomtom84/mastertomtom842012-03-061-0/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fix in navbartommy tomson2012-03-071-0/+4
| | | |/ | | |/|
| * | | Merge pull request #100 from simonlnu/masterSimon2012-03-065-2/+2
| |\ \ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-066-7/+15
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0613-38/+70
| | |\ \ \
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
| | | | | * improved smiley transparencyThomas2012-03-0620-2/+2
* | | | | | [privacy] rework latest fixfriendica2012-03-062-4/+3
* | | | | | remove stray debuggingfriendica2012-03-061-2/+2
|/ / / / /
* | | | | Merge branch 'pull'friendica2012-03-0612-37/+69
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #94 from beardy-unixer/masterSimon2012-03-067-16/+45
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed...merged with mainline THEN added beards.Thomas2012-03-061-5/+36
| | * | | added beard smileysThomas2012-03-063-35/+8
| | * | | doc/Account-Basics.mdThomas2012-03-061-1/+1
| | * | | doc/Account-Basics.mdThomas2012-03-061-2/+1