aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed npe in block menu itemDaniel Gultsch2014-12-301-1/+1
* fixed nl stringsDaniel Gultsch2014-12-301-25/+1
* fixed #818Daniel Gultsch2014-12-301-1/+1
* Merge pull request #812 from kriztan/patch-1Daniel Gultsch2014-12-301-0/+4
|\
| * Update german translationskriztan2014-12-271-0/+4
* | Merge pull request #813 from plsng/translationDaniel Gultsch2014-12-302-114/+292
|\ \
| * | Update Dutch translationsNathan Follens2014-12-292-10/+10
| * | Update Dutch translationsNathan Follens2014-12-272-113/+291
| |/
* | Merge pull request #814 from kruks23/translation1Daniel Gultsch2014-12-301-3/+27
|\ \
| * | Update spanish translationssergio2014-12-271-3/+27
| |/
* / Fix typo in method nameSam Whited2014-12-295-9/+9
|/
* code cleanup for change password stuffDaniel Gultsch2014-12-253-15/+22
* added callback to change account password to notify UI on success / failureDaniel Gultsch2014-12-254-27/+66
* Add ability to change password on serverSam Whited2014-12-259-88/+139
* proper call to invalidateViews()Daniel Gultsch2014-12-251-1/+1
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
* Merge pull request #810 from kriztan/patch-2Daniel Gultsch2014-12-251-0/+20
|\
| * Update german translationskriztan2014-12-251-0/+20
* | Show server info option when blocking is unavailablepulser2014-12-241-2/+4
|/
* Don't allow user to register domain only jidsSam Whited2014-12-231-0/+5
* Don't show menu on create account screenSam Whited2014-12-231-0/+3
* Remove old JID validatorSam Whited2014-12-233-105/+77
* Add more server compatibility info.Sam Whited2014-12-234-6/+150
* made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
* Simplify roster handling codeSam Whited2014-12-223-121/+97
* Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2242-903/+1481
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-203-75/+46
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
* fixed another break continue bugiNPUTmice2014-12-201-3/+2
* inject ui callback into running mam queryiNPUTmice2014-12-203-4/+6
* Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
|\
| * Czech image transfer string fixJaroslav Lichtblau2014-12-191-2/+2
* | Update spanish translationskruks232014-12-201-4/+12
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-192-0/+16
|\|
| * Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| * Update german translationskriztan2014-12-181-0/+8
* | fixed #755iNPUTmice2014-12-191-1/+1
|/
* clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-173-4/+12
* show error if jid couldn't be parsed in new contact dialogiNPUTmice2014-12-171-15/+10
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-173-18/+19
|\
| * Merge pull request #783 from SamWhited/quiet-hoursDaniel Gultsch2014-12-173-18/+19
| |\
| | * Handle time comparisons using longsSam Whited2014-12-162-13/+8
| | * Update summary in TimePreference change listenerSam Whited2014-12-151-5/+11
* | | made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-174-21/+48
* | | smoothed out scrolling a bitiNPUTmice2014-12-173-23/+45
|/ /
* | properly detect images in share withiNPUTmice2014-12-171-6/+6
* | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...iNPUTmice2014-12-172-25/+37
|\ \
| * | Allow sending of any filetype via intentSam Whited2014-12-152-25/+37
| |/