aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Some security against XSRF-attacksTobias Hößl2012-03-1213-39/+132
|
* Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1212-157/+255
|\
| * Merge branch 'pull'friendica2012-03-121-17/+18
| |\
| | * fix dispy-dark photo album stuffSimon L'nu2012-03-111-17/+18
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-110-0/+0
| | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | more save to file backendfriendica2012-03-111-1/+55
| | |
| * | backend for "save to file" featurefriendica2012-03-112-7/+33
| |/
| * Merge pull request #124 from simonlnu/masterSimon2012-03-117-130/+147
| |\ | | | | | | fix dispys' css and layout
| | * fix dispys' css and layoutSimon L'nu2012-03-117-130/+147
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-113-3/+3
| | |\ | | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: community meta tag renamed from "ika" * master:
| * | Merge branch 'pull'friendica2012-03-112-7/+29
| |\ \
| * | | community meta tag renamed from "ika"friendica2012-03-113-3/+3
| | | |
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-110-0/+0
| | |/ | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
* | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-112-7/+29
|\ \ \ | | |/ | |/|
| * | Merge pull request #123 from simonlnu/masterSimon2012-03-111-1/+1
| |\ \ | | | | | | | | screwed up on the font-size for screen last push
| | * | screwed up on the font-size for screen last pushSimon L'nu2012-03-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-110-0/+0
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge pull request #122 from simonlnu/masterSimon2012-03-112-1/+14
| |\ \ | | | | | | | | add some '@media handheld' types for dispys
| | * | add some '@media handheld' types for dispysSimon L'nu2012-03-112-1/+14
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge pull request #121 from simonlnu/masterSimon2012-03-111-5/+9
| |\| | | | | | | | | | fix more stuff
| | * | fix more stuffSimon L'nu2012-03-111-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge pull request #120 from simonlnu/masterSimon2012-03-111-2/+7
| |\| | | | |/ | |/| fix some stuff right away
| | * fix some stuff right awaySimon L'nu2012-03-111-2/+7
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | 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
| |\ \