Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-01 | 11 | -9/+4640 |
|\ | |||||
| * | improve colour balance and banner on html email notifications | Friendika | 2011-05-31 | 3 | -3/+4 |
| | | |||||
| * | Brazilian (portugese) translation | Friendika | 2011-05-31 | 2 | -0/+4605 |
| | | |||||
| * | show group affiliations in contact editor | Friendika | 2011-05-31 | 3 | -0/+24 |
| | | |||||
| * | don't count wall posts in unseen network total | Friendika | 2011-05-31 | 2 | -4/+3 |
| | | |||||
| * | put oembed settings into a .settings-block div for consistency | Friendika | 2011-05-30 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-31 | 8 | -11/+46 |
|\| | |||||
| * | show linked url on user's contact page | Friendika | 2011-05-30 | 1 | -3/+3 |
| | | |||||
| * | sort wall items by date order instead of id. bug #61 | Friendika | 2011-05-30 | 2 | -4/+5 |
| | | |||||
| * | on rare occasions posts do not get a parent. The only thing which could ↵ | Friendika | 2011-05-29 | 2 | -2/+15 |
| | | | | | | | | cause it is if we can't find our new post. So we'll check for this and try one more time before failing. | ||||
| * | order groups by name | Friendika | 2011-05-29 | 1 | -1/+1 |
| | | |||||
| * | bug #87 alert if email settings don't open mailbox, also display last email ↵ | Friendika | 2011-05-29 | 2 | -1/+22 |
| | | | | | | | | connect time | ||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-30 | 7 | -20/+4636 |
|\| | |||||
| * | bug #62 - opt-out of importing FB friends/conversations but still allow FB ↵ | Friendika | 2011-05-29 | 1 | -2/+48 |
| | | | | | | | | posting | ||||
| * | Czech (cs) language | Friendika | 2011-05-29 | 2 | -0/+4575 |
| | | |||||
| * | readme update | Friendika | 2011-05-29 | 1 | -5/+5 |
| | | |||||
| * | small fixes to item post to try and sort out segfault issues on php 5.3 (?) | Friendika | 2011-05-29 | 3 | -13/+8 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-28 | 19 | -45/+203 |
|\| | |||||
| * | bug #38 ability to restrict profile, wall, photos from non-friends | Friendika | 2011-05-28 | 2 | -2/+2 |
| | | |||||
| * | bug #38 posts and photos only visible to friends if so configured | Friendika | 2011-05-28 | 3 | -7/+19 |
| | | |||||
| * | begin event module | Friendika | 2011-05-27 | 1 | -0/+34 |
| | | |||||
| * | correct nickname for display link on comment emails | Friendika | 2011-05-27 | 1 | -2/+2 |
| | | |||||
| * | item/event linkage | Friendika | 2011-05-27 | 3 | -1/+6 |
| | | |||||
| * | duplicate likes if we posted it locally and it also comes back from FB | Friendika | 2011-05-27 | 2 | -3/+9 |
| | | |||||
| * | email - search from, to, cc, and bcc | Friendika | 2011-05-27 | 1 | -9/+16 |
| | | |||||
| * | don't reset photo permissions unless photo has owner-only permissions | Friendika | 2011-05-27 | 1 | -1/+13 |
| | | |||||
| * | troublesome feed was a 307 redirect. We didn't recognise 307 | Friendika | 2011-05-26 | 2 | -2/+10 |
| | | |||||
| * | search from network page | Friendika | 2011-05-26 | 4 | -6/+39 |
| | | |||||
| * | add webfinger diagnostic module | Friendika | 2011-05-26 | 2 | -1/+25 |
| | | |||||
| * | add attachments to FB posts, fix paren string in statusnet, do not insert ↵ | Friendika | 2011-05-26 | 6 | -16/+33 |
| | | | | | | | | attach div into post if no attachments | ||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-26 | 12 | -1693/+1793 |
|\| | |||||
| * | cleanup content type icons | Friendika | 2011-05-25 | 4 | -3/+3 |
| | | |||||
| * | sort out a couple of email notify issues | Friendika | 2011-05-25 | 2 | -23/+23 |
| | | |||||
| * | explain that blocking profile wall access will effectively block OStatus ↵ | Friendika | 2011-05-25 | 1 | -0/+2 |
| | | | | | | | | communications. | ||||
| * | minor string update | Friendika | 2011-05-25 | 4 | -1634/+1671 |
| | | |||||
| * | remove debug line | Friendika | 2011-05-25 | 1 | -1/+1 |
| | | |||||
| * | position the attach icon in loozah | Friendika | 2011-05-25 | 1 | -1/+6 |
| | | |||||
| * | Merge branch 'pull' | Friendika | 2011-05-25 | 1 | -4/+11 |
| |\ | |||||
| | * | Merge pull request #111 from fabrixxm/dispy | Friendika | 2011-05-25 | 1 | -4/+11 |
| | |\ | | | | | | | | | fix profile images and contact selector in group editor in dispy theme | ||||
| | | * | fix profile images and contact selector in group editor in dispy theme | Fabio Comuni | 2011-05-24 | 1 | -4/+11 |
| | | | | |||||
| * | | | revup | Friendika | 2011-05-25 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #110 from fabrixxm/master | Friendika | 2011-05-25 | 2 | -220/+269 |
| |\ \ | | | | | | | | | Small tweak to a copule of translatable strings | ||||
| | * | | Small tweak to a copule of translatable strings | Fabio Comuni | 2011-05-25 | 2 | -220/+269 |
| |/ / | |||||
* | | | typo | Tobias Diekershoff | 2011-05-25 | 2 | -3/+4 |
| | | | |||||
* | | | German translations | Tobias Diekershoff | 2011-05-25 | 1 | -10/+32 |
| | | | |||||
* | | | new german strings | Tobias Diekershoff | 2011-05-25 | 1 | -261/+369 |
|/ / | |||||
* | | file attachments | Friendika | 2011-05-25 | 9 | -13/+139 |
| | | |||||
* | | fix attach icon | Friendika | 2011-05-24 | 3 | -1/+3 |
| | | |||||
* | | basic file upload/attach | Friendika | 2011-05-24 | 9 | -4/+216 |
| | | |||||
* | | more position tweaks on attach icons | Friendika | 2011-05-24 | 2 | -4/+5 |
| | |