aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/AvatarService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-091-2/+2
|\ | | | | | | development
| * Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-2/+2
| | | | | | | | Remove `Account.getFullJid()'
* | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ | |/ |/|
| * make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
| |
* | Create avatar's for JID's w/o localpartsSam Whited2014-11-091-3/+3
| |
* | Fields that we sync on should be finalSam Whited2014-11-091-1/+1
| |
* | Update more files to use JID objectsSam Whited2014-11-091-1/+1
|/
* fixed #617iNPUTmice2014-11-051-26/+22
|
* Merge branch 'gradle' into developmentSam Whited2014-10-301-6/+0
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-221-0/+298