aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-307-20/+4636
|\
| * bug #62 - opt-out of importing FB friends/conversations but still allow FB po...Friendika2011-05-291-2/+48
| * Czech (cs) languageFriendika2011-05-292-0/+4575
| * readme updateFriendika2011-05-291-5/+5
| * small fixes to item post to try and sort out segfault issues on php 5.3 (?)Friendika2011-05-293-13/+8
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2819-45/+203
|\|
| * bug #38 ability to restrict profile, wall, photos from non-friendsFriendika2011-05-282-2/+2
| * bug #38 posts and photos only visible to friends if so configuredFriendika2011-05-283-7/+19
| * begin event moduleFriendika2011-05-271-0/+34
| * correct nickname for display link on comment emailsFriendika2011-05-271-2/+2
| * item/event linkageFriendika2011-05-273-1/+6
| * duplicate likes if we posted it locally and it also comes back from FBFriendika2011-05-272-3/+9
| * email - search from, to, cc, and bccFriendika2011-05-271-9/+16
| * don't reset photo permissions unless photo has owner-only permissionsFriendika2011-05-271-1/+13
| * troublesome feed was a 307 redirect. We didn't recognise 307Friendika2011-05-262-2/+10
| * search from network pageFriendika2011-05-264-6/+39
| * add webfinger diagnostic moduleFriendika2011-05-262-1/+25
| * add attachments to FB posts, fix paren string in statusnet, do not insert att...Friendika2011-05-266-16/+33
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2612-1693/+1793
|\|
| * cleanup content type iconsFriendika2011-05-254-3/+3
| * sort out a couple of email notify issuesFriendika2011-05-252-23/+23
| * explain that blocking profile wall access will effectively block OStatus comm...Friendika2011-05-251-0/+2
| * minor string updateFriendika2011-05-254-1634/+1671
| * remove debug lineFriendika2011-05-251-1/+1
| * position the attach icon in loozahFriendika2011-05-251-1/+6
| * Merge branch 'pull'Friendika2011-05-251-4/+11
| |\
| | * Merge pull request #111 from fabrixxm/dispyFriendika2011-05-251-4/+11
| | |\
| | | * fix profile images and contact selector in group editor in dispy themeFabio Comuni2011-05-241-4/+11
| * | | revupFriendika2011-05-251-1/+1
| |/ /
| * | Merge pull request #110 from fabrixxm/masterFriendika2011-05-252-220/+269
| |\ \
| | * | Small tweak to a copule of translatable stringsFabio Comuni2011-05-252-220/+269
| |/ /
* | | typoTobias Diekershoff2011-05-252-3/+4
* | | German translationsTobias Diekershoff2011-05-251-10/+32
* | | new german stringsTobias Diekershoff2011-05-251-261/+369
|/ /
* | file attachmentsFriendika2011-05-259-13/+139
* | fix attach iconFriendika2011-05-243-1/+3
* | basic file upload/attachFriendika2011-05-249-4/+216
* | more position tweaks on attach iconsFriendika2011-05-242-4/+5
* | open attachment in new windowFriendika2011-05-241-1/+1
* | better marginsFriendika2011-05-243-1/+8
* | remove paddingFriendika2011-05-243-3/+0
* | clearup float, fix iconFriendika2011-05-241-2/+3
* | turn on attach displayFriendika2011-05-241-2/+2
* | attachment displayFriendika2011-05-245-4/+46
* | attachment iconsFriendika2011-05-244-0/+38
* | ability to hide profile and wall from unknown peopleFriendika2011-05-2410-7/+63
|/
* improve push_lang and pop_lang to do basically nothing if the new language is...Friendika2011-05-231-0/+7
* bug #85Friendika2011-05-2310-7/+69
* Merge branch 'pull'Friendika2011-05-238-110/+222
|\
| * Merge pull request #108 from fabrixxm/widgetFriendika2011-05-231-2/+5
| |\