aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-022-23/+98
| |\ \ \ | | |/ / | |/| | Updated Czech translation file
| | * | pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| | | |
| | * | Added Czech translator nameJaroslav Lichtblau2014-12-011-0/+1
| | | |
| | * | Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
| | | | | | | | | | | | | | | | | | | | added missing strings fixing typos, improvements for better understanding
* | | | safety net in joinMuciNPUTmice2014-12-031-4/+6
| | | |
* | | | clean up getProposedNickiNPUTmice2014-12-031-6/+5
| | | |
* | | | fixed potential npes in message parseriNPUTmice2014-12-031-2/+7
| | | |
* | | | cleaned up avatar / tile creationiNPUTmice2014-12-032-20/+9
|/ / /
* | | fixed #728iNPUTmice2014-12-011-5/+2
| | |
* | | 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
|\ \ \ | | | | | | | | Update Italian translations
| * | | 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
|\ \ | | | | | | Warning "fixes"
| * | 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 translation
| * | | 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 ↵iNPUTmice2014-11-271-1/+1
|\ \ | | | | | | | | | development
| * \ Merge pull request #716 from kriztan/patch-3Daniel Gultsch2014-11-261-1/+1
| |\ \ | | | | | | | | Update german translations
| | * | Update german translationskriztan2014-11-261-1/+1
| |/ / | | | | | | modified translations a bit
* | | 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
|\ \ | | | | | | MUC: do not add yourself to the muc user list.
| * | add an listener for the muc roster update.Michael2014-11-234-1/+63
| | | | | | | | | | | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately.
| * | 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.
| * | 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 translation
| * Update german translationskriztan2014-11-231-0/+2
|/
* Merge pull request #709 from kruks23/translationDaniel Gultsch2014-11-221-2/+8
|\ | | | | Update spanish translations
| * 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.
| * 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.
| * | 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
|/