aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* spec directoryfriendica2012-03-094-0/+0
* Merge branch 'pull'friendica2012-03-0910-86/+157
|\
| * Merge pull request #116 from tomtom84/mastertomtom842012-03-095-0/+134
| |\
| | * add js to hide nav-menus, when clicked outsidetommy tomson2012-03-095-0/+134
| * | Merge pull request #115 from tomtom84/mastertomtom842012-03-096-86/+23
| |\|
| | * fixes in csstommy tomson2012-03-096-86/+23
* | | revupfriendica2012-03-091-1/+1
|/ /
* | recover contacts total count which got lostfriendica2012-03-091-3/+4
* | Merge branch 'pull'friendica2012-03-097-5/+25
|\ \
| * \ Merge pull request #114 from simonlnu/masterSimon2012-03-087-5/+25
| |\ \
| | * | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label...Simon L'nu2012-03-097-5/+25
* | | | bug #324 - tinymce used for mail even if editplain being used.friendica2012-03-092-48/+37
* | | | bug in check for private email comment to public conversation prevents authen...friendica2012-03-092-23/+9
|/ / /
* | | keep tony from talking to himselffriendica2012-03-082-2/+2
* | | Merge pull request #113 from simonlnu/masterSimon2012-03-087-10/+358
|\| |
| * | i consider dispy pretty stable at this point, so i'm removing the experimenta...Simon L'nu2012-03-091-0/+0
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0813-37/+19
| |\ \ | |/ / |/| |
* | | Merge pull request #112 from tomtom84/mastertomtom842012-03-082-14/+0
|\ \ \ | | |/ | |/|
| * | removed infotommy tomson2012-03-092-14/+0
* | | Merge pull request #111 from tomtom84/mastertomtom842012-03-082-0/+14
|\| |
| * | add infotommy tomson2012-03-092-0/+14
* | | Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e...friendica2012-03-083-0/+0
|\ \ \
| * | | More improved transparency for smiliesThomas2012-03-093-0/+0
| * | | removed dolphin file (wtf?)Thomas2012-03-071-7/+0
| * | | .Thomas2012-03-071-0/+7
* | | | Merge pull request #110 from tomtom84/mastertomtom842012-03-0810-37/+19
|\ \ \ \ | | |/ / | |/| |
| * | | fixed star-bugtommy tomson2012-03-0910-37/+19
| | | * 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