aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bumped cap version as welliNPUTmice2014-12-011-1/+1
* version bump to 0.9.1 and changelogiNPUTmice2014-12-012-2/+5
* clear encrypted messages on reinitiNPUTmice2014-12-011-2/+13
* worked around rare npeiNPUTmice2014-12-011-5/+12
* fixed npe if roster jid couldnt be parsediNPUTmice2014-12-011-8/+5
* fixed italian translationiNPUTmice2014-12-011-5/+5
* Merge pull request #726 from Elinvention/developmentDaniel Gultsch2014-12-012-10/+89
|\
| * Removed pref_about_message which is not translatableElinvention2014-11-301-24/+0
| * Added missing italian translations with some minor fixes to existing onesElinvention2014-11-302-10/+113
* | do not query service info from main server againiNPUTmice2014-12-011-5/+3
* | don't request fragment before updatingiNPUTmice2014-11-301-6/+2
|/
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-294-6/+14
|\
| * Accessibility: Add missing image descriptionsSam Whited2014-11-293-3/+8
| * Misc. "fixes" to correct warnings.Sam Whited2014-11-291-3/+6
* | Merge pull request #718 from beriain/developmentDaniel Gultsch2014-11-291-0/+6
|\ \
| * | Update basque translationAitor Beriain2014-11-271-0/+6
| |/
* | fixed npe for broken bookmarksiNPUTmice2014-11-291-7/+8
* | version bump to 0.9iNPUTmice2014-11-292-1/+10
* | fix for concurrency issueiNPUTmice2014-11-291-1/+1
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-271-1/+1
|\
| * Merge pull request #716 from kriztan/patch-3Daniel Gultsch2014-11-261-1/+1
| |\
| | * Update german translationskriztan2014-11-261-1/+1
| |/
* | fixed npe. fixed #717iNPUTmice2014-11-271-5/+6
* | create conversation with bare jidiNPUTmice2014-11-271-1/+1
* | use getAttributeAsJid methodiNPUTmice2014-11-271-6/+1
|/
* Merge pull request #713 from betheg/mucDaniel Gultsch2014-11-245-1/+65
|\
| * add an listener for the muc roster update.Michael2014-11-234-1/+63
| * MUC: do not add yourself to the muc user list.Michael2014-11-231-0/+2
* | Merge pull request #714 from betheg/muc_bookmark_cdDaniel Gultsch2014-11-242-0/+49
|\ \
| * | MUC: option to set/delete bookmark in conference details.Michael2014-11-232-0/+49
| |/
* | Merge pull request #712 from kriztan/patch-2Daniel Gultsch2014-11-241-0/+2
|\ \ | |/ |/|
| * Update german translationskriztan2014-11-231-0/+2
|/
* Merge pull request #709 from kruks23/translationDaniel Gultsch2014-11-221-2/+8
|\
| * Update spanish translationskruks232014-11-221-2/+8
|/
* work around to not confuse irc transport with real conference serversiNPUTmice2014-11-211-2/+7
* Merge pull request #706 from betheg/unused_importsDaniel Gultsch2014-11-2112-38/+0
|\
| * remove unused imports.Michael2014-11-2112-38/+0
* | update action bar with conversations updates as welliNPUTmice2014-11-212-52/+45
* | Merge pull request #707 from betheg/joinmucDaniel Gultsch2014-11-211-0/+1
|\ \
| * | MUC: set from when join muc.Michael2014-11-211-0/+1
|/ /
* / move task to back and not finish when hitting back buttoniNPUTmice2014-11-211-7/+5
|/
* Merge pull request #705 from betheg/mucDaniel Gultsch2014-11-211-10/+16
|\
| * STATUS_CODE_SELF_PRESENCE is not set in all case.Michael2014-11-211-10/+16
|/
* additional null pointer saftey checksiNPUTmice2014-11-211-15/+13
* verify contacts key only on initiating side of smpiNPUTmice2014-11-214-7/+20
* changed listener timing and cache clearing after muc presencesiNPUTmice2014-11-201-6/+9
* create file and dirs before creating fileiNPUTmice2014-11-201-0/+2
* Merge pull request #698 from kriztan/patch-1Daniel Gultsch2014-11-201-16/+20
|\
| * Update german translationskriztan2014-11-201-16/+20
* | Merge pull request #699 from betheg/status_codeDaniel Gultsch2014-11-201-3/+5
|\ \ | |/ |/|