aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1162-559/+7162
|\
| * Merge pull request #119 from simonlnu/masterSimon2012-03-1033-13/+6144
| |\ | | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
| | * preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Simon L'nu2012-03-1133-13/+6144
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1115-494/+883
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master:
| * | bug #328friendica2012-03-101-3/+3
| | |
| * | default the text template var on conversationsfriendica2012-03-101-0/+1
| | |
| * | 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 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-108-2/+13
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: spec directory allow user to set number of items to show on network page revup * master:
| * | | 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
| |\| | |
| * | | | revupfriendica2012-03-091-1/+1
| | | | |
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-090-0/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add js to hide nav-menus, when clicked outside fixes in css recover contacts total count which got lost bug #324 - tinymce used for mail even if editplain being used. bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed keep tony from talking to himself * master:
| | * | 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
| | |
| * | recover contacts total count which got lostfriendica2012-03-091-3/+4
| | |
* | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-09252-3416/+20704
|\| |
| * | 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
| | |\| | |