aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bug #327 - composed private message is lost if no recip specified.friendica2012-03-102-6/+16
|
* Merge branch 'pull'friendica2012-03-1011-484/+862
|\
| * Merge pull request #118 from tomtom84/mastertomtom842012-03-109-11/+52
| |\ | | | | | | fixes in diabook-derivates
| | * fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-109-11/+52
| | |
| * | German translationTobias Diekershoff2012-03-102-473/+810
| | |
* | | revupfriendica2012-03-101-1/+1
|/ /
* | Merge branch 'pull'friendica2012-03-093-1/+12
|\ \
| * \ Merge pull request #117 from unary/issue299friendica2012-03-093-1/+12
| |\ \ | | | | | | | | allow user to set number of items to show on network page
| | * | allow user to set number of items to show on network pageMichael Johnston2012-03-093-1/+12
| |/ /
* | | 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
| |\| | | | | | | fixes in diabook-derivates
| | * 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 diabook-derivates
| | * 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.
| | * | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style ↵Simon L'nu2012-03-097-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | label elemnts. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | | 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 ↵friendica2012-03-092-23/+9
|/ / / | | | | | | | | | authenticated visitor from seeing comments that should be allowed
* | | keep tony from talking to himselffriendica2012-03-082-2/+2
| | |
* | | Merge pull request #113 from simonlnu/masterSimon2012-03-087-10/+358
|\| | | | | | | | dispy stable enough to be considered stable IMO
| * | i consider dispy pretty stable at this point, so i'm removing the ↵Simon L'nu2012-03-091-0/+0
| | | | | | | | | | | | | | | | | | experimental file Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0813-37/+19
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: removed info add info fixed star-bug More improved transparency for smilies removed dolphin file (wtf?) . * master:
* | | Merge pull request #112 from tomtom84/mastertomtom842012-03-082-14/+0
|\ \ \ | | |/ | |/| fixes in diabook-derivates
| * | removed infotommy tomson2012-03-092-14/+0
| | |
* | | Merge pull request #111 from tomtom84/mastertomtom842012-03-082-0/+14
|\| | | | | | | | fixes in diabook-derivates
| * | add infotommy tomson2012-03-092-0/+14
| | |
* | | Merge pull request #109 from ↵friendica2012-03-083-0/+0
|\ \ \ | | | | | | | | | | | | | | | | beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5 More improved transparency smileys
| * | | 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
|\ \ \ \ | | |/ / | |/| | fixes in diabook-derivates
| * | | fixed star-bugtommy tomson2012-03-0910-37/+19
| | | |
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0868-7/+10831
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme info file for testbubble catalan translation revup add theme diabook-blue, fix css * master:
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| | | * Merge pull request #108 from simonlnu/masterSimon2012-03-086-10/+358
| | | |\ | | | | | | | | | | make svg from notifications.svg to ease future editing. more dispy tweaks
| | | | * make svg from notifications.svg to ease future editing. more dispy tweaksSimon L'nu2012-03-086-10/+358
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-087-7/+109
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add links to /profiles, add some icons to diabook/icons, fixes in css Update README reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) * master:
| | | * | Merge pull request #107 from tomtom84/mastertomtom842012-03-085-6/+101
| |_|/| | |/| |/ / | |/| | fixes in theme diabook
| * | | add links to /profiles, add some icons to diabook/icons, fixes in csstommy tomson2012-03-085-6/+101
| | | |
* | | | Update READMEfriendica2012-03-081-0/+7
| | | |