aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* check if service is bound before adding conferences or contactsiNPUTmice2014-08-211-25/+30
* avoid race condition for otr key in jingleiNPUTmice2014-08-211-1/+1
* deregister listener in editaccountiNPUTmice2014-08-211-0/+8
* added missing string resource againiNPUTmice2014-08-201-0/+2
* revised manage account activity. removed contexual action modeiNPUTmice2014-08-206-237/+159
* fixed lint erroriNPUTmice2014-08-191-1/+0
* better error display and additional infos (stats) for the edit account activityiNPUTmice2014-08-1911-377/+314
* Merge pull request #365 from beriain/developmentDaniel Gultsch2014-08-191-3/+19
|\
| * Update strings.xmlAitor Beriain2014-08-181-3/+19
* | Merge pull request #363 from kriztan/patch-1Daniel Gultsch2014-08-191-0/+1
|\ \
| * | Update strings.xmlkriztan2014-08-171-0/+1
|/ /
* | more error handling for avatar publicationiNPUTmice2014-08-162-1/+17
* | some improvements for the edit account activityiNPUTmice2014-08-163-31/+25
* | moved add/edit account from dialog into seperate activityiNPUTmice2014-08-1513-255/+521
* | better handling of null streamsiNPUTmice2014-08-153-14/+22
* | refactored Conversations Adapter into seperate classiNPUTmice2014-08-152-93/+114
* | 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