Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | copy commits | Christian S | 2015-12-16 | 1 | -0/+5 |
|\ | |||||
| * | when no avatar found show avatar of contact and not the muc user in conferences | Daniel Gultsch | 2015-12-09 | 1 | -1/+6 |
| | | |||||
| * | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-04 | 1 | -8/+14 |
| | | |||||
| * | fixed showing avatars for contacts in muc | Daniel Gultsch | 2015-12-04 | 1 | -1/+10 |
| | | |||||
| * | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-03 | 1 | -7/+43 |
| | | |||||
* | | when no avatar found show avatar of contact and not the muc user in conferences | Daniel Gultsch | 2015-12-12 | 1 | -1/+6 |
| | | |||||
* | | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-06 | 1 | -8/+14 |
| | | |||||
* | | fixed showing avatars for contacts in muc | Daniel Gultsch | 2015-12-04 | 1 | -1/+10 |
| | | |||||
* | | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-04 | 1 | -0/+5 |
| | | |||||
* | | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-04 | 1 | -7/+43 |
| | | |||||
* | | Merge pull request #52 from fiaxh/conference_one_other_occupant | Christian S | 2015-11-15 | 1 | -20/+48 |
|\| | | | | | Own contact picture in tile for conferences with only one other occupant | ||||
| * | Own contact picture in tile for conferences with only one other occupant | fiaxh | 2015-11-15 | 1 | -20/+48 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -2/+19 |
|\| | |||||
| * | load avatars in message adapter in background task | Daniel Gultsch | 2015-10-29 | 1 | -2/+19 |
| | | |||||
* | | small avatar modifications | Christian S | 2015-07-04 | 1 | -6/+6 |
|/ | | | | | | *show bigger avatar in contact details *prefer profile avatar instead of contact picture from addressbook *show more bigger avatar in contact details | ||||
* | loading avatars in seperate tasks | iNPUTmice | 2015-02-15 | 1 | -14/+26 |
| | |||||
* | handle muc nicks with white spaces. fixed #884 | iNPUTmice | 2015-01-14 | 1 | -1/+2 |
| | |||||
* | cleaned up avatar / tile creation | iNPUTmice | 2014-12-03 | 1 | -20/+6 |
| | |||||
* | fix for concurrency issue | iNPUTmice | 2014-11-29 | 1 | -1/+1 |
| | |||||
* | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 1 | -1/+1 |
| | |||||
* | synchronized around cache clear in avatar service | iNPUTmice | 2014-11-17 | 1 | -9/+15 |
| | |||||
* | happy hanukkah | iNPUTmice | 2014-11-16 | 1 | -10/+4 |
| | |||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-09 | 1 | -2/+2 |
|\ | | | | | | | development | ||||
| * | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 1 | -2/+2 |
| | | | | | | | | Remove `Account.getFullJid()' | ||||
* | | Merge branch 'master' into development | iNPUTmice | 2014-11-09 | 1 | -14/+22 |
|\ \ | |/ |/| | |||||
| * | make avatar service not break on empty names | iNPUTmice | 2014-11-09 | 1 | -14/+22 |
| | | |||||
* | | Create avatar's for JID's w/o localparts | Sam Whited | 2014-11-09 | 1 | -3/+3 |
| | | |||||
* | | Fields that we sync on should be final | Sam Whited | 2014-11-09 | 1 | -1/+1 |
| | | |||||
* | | Update more files to use JID objects | Sam Whited | 2014-11-09 | 1 | -1/+1 |
|/ | |||||
* | fixed #617 | iNPUTmice | 2014-11-05 | 1 | -26/+22 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -6/+0 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+298 |