aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-08-151-18/+29
|\
| * Merge pull request #355 from kriztan/patch-2Daniel Gultsch2014-08-151-18/+29
| |\
| | * Update strings.xmlkriztan2014-08-151-1/+1
| | * Update strings.xmlkriztan2014-08-151-17/+28
| |/
* | fixed #356iNPUTmice2014-08-151-10/+12
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-08-145-2/+316
|\|
| * Merge pull request #354 from GreenLunar/developmentDaniel Gultsch2014-08-142-0/+306
| |\
| | * Add Hebrew translation.GreenLunar2014-08-141-0/+284
| | * Add Hebrew translation.GreenLunar2014-08-141-0/+22
| |/
| * Merge pull request #349 from kruks23/developmentDaniel Gultsch2014-08-143-2/+10
| |\
| | * Update Spanish Translations + publish_avatar button and menu conflictkruks232014-08-123-2/+10
* | | fixed muc pm avatariNPUTmice2014-08-141-2/+5
|/ /
* | fixed bug in caps hash generation. thanks Asterix of the Gajim projectiNPUTmice2014-08-141-1/+1
* | another rare npe fixediNPUTmice2014-08-141-0/+6
* | trying to fix rotation problemsiNPUTmice2014-08-131-13/+37
* | fixed #348iNPUTmice2014-08-132-14/+14
* | only notify ui on significant muc changesiNPUTmice2014-08-131-1/+8
* | try to make openpgp a little more reliableiNPUTmice2014-08-131-10/+27
* | fixed weird snackbar click issuesiNPUTmice2014-08-121-0/+2
* | fixed long press to bring back default in publish avatar activityiNPUTmice2014-08-121-7/+14
* | show user name as well in confernce details if real name was showniNPUTmice2014-08-121-1/+3
* | show own avatar in muc detailsiNPUTmice2014-08-112-3/+2
* | fixed avatar in notificationiNPUTmice2014-08-113-19/+32
|/
* handle bare jid presences. fixes for otriNPUTmice2014-08-115-33/+50
* Merge pull request #344 from 1nsan3/developmentDaniel Gultsch2014-08-111-0/+14
|\
| * Updated StartConversationActivity to react on Search Button PressingGero Kraus2014-08-101-0/+14
* | added limited private muc chat feature (messages are now properly marked) - l...iNPUTmice2014-08-107-30/+155
* | fixed rare npe after race conditioniNPUTmice2014-08-101-0/+1
* | potential fix for rejected execution exceptioniNPUTmice2014-08-101-2/+7
|/
* changed all displays of avatars to be center crop instead of fitXYiNPUTmice2014-08-095-4/+6
* work around xml parser issues...iNPUTmice2014-08-091-1/+1
* trying to fix activity has been destroyed erroriNPUTmice2014-08-091-1/+4
* show add to roster dialog when trying to start otr sessioniNPUTmice2014-08-091-1/+1
* fixed very rare npeiNPUTmice2014-08-091-8/+10
* added warning lable if server doesn't support pubsub. refactored feature iden...iNPUTmice2014-08-094-35/+64
* bug fix for 'back to default'iNPUTmice2014-08-091-2/+4
* ability to bring default picture back with long press in publish avatariNPUTmice2014-08-093-6/+36
* grant uri permission on share pictureiNPUTmice2014-08-091-1/+1
* more fixes for notfication in conferencesiNPUTmice2014-08-091-2/+2
* save images to external storage instead of internal. this requires more permi...iNPUTmice2014-08-086-283/+417
* fixed #320iNPUTmice2014-08-071-1/+1
* bug fix for not working notification grace period in muciNPUTmice2014-08-071-1/+1
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-08-062-1/+7
|\
| * Merge pull request #339 from kruks23/developmentDaniel Gultsch2014-08-052-1/+7
| |\
| | * Update Spanish Translations + gallerykruks232014-08-052-1/+7
* | | fixed problems with sha sum calculation on avatar write. delete avatars with ...iNPUTmice2014-08-064-20/+43
|/ /
* / fetch missing avatars from serveriNPUTmice2014-08-0511-15/+152
|/
* show own avatar after publication. no persistancy yetiNPUTmice2014-08-054-6/+41
* error messages for publish avatariNPUTmice2014-08-054-12/+37
* publish avatarsiNPUTmice2014-08-0512-35/+197