aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into developmentDaniel Gultsch2015-01-021-0/+7
|\
| * Merge pull request #826 from kriztan/patch-1Daniel Gultsch2015-01-021-0/+7
| |\
| | * Added German translationskriztan2015-01-021-0/+7
* | | allow cancellation of waiting filesDaniel Gultsch2015-01-022-19/+23
|/ /
* / put Conversations into background mode earlierDaniel Gultsch2015-01-025-19/+44
|/
* prefer PLAIN over DIGEST-MD5Daniel Gultsch2015-01-022-3/+3
* fixed layout fileDaniel Gultsch2015-01-021-1/+1
* improved OTR verification part oneDaniel Gultsch2015-01-0212-352/+403
* Merge remote-tracking branch 'origin/development' into developmentDaniel Gultsch2014-12-3015-22/+8
|\
| * Merge pull request #821 from SamWhited/appnametranslationDaniel Gultsch2014-12-3015-22/+8
| |\
| | * Make `app_name' string untranslatableSam Whited2014-12-2915-22/+8
| |/
* / improved fromServer filterDaniel Gultsch2014-12-301-1/+4
|/
* refactor swithOverToTls stuffDaniel Gultsch2014-12-301-56/+45
* 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
| |/
* | Merge pull request #819 from SamWhited/spellingDaniel Gultsch2014-12-307-58/+58
|\ \ | |/ |/|
| * Fix typo in method nameSam Whited2014-12-295-9/+9
| * Rename observations doc fileSam Whited2014-12-291-0/+0
| * Fix spelling in the docsSam Whited2014-12-282-49/+49
|/
* 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
* | Merge pull request #809 from pulser/server-info-fixDaniel Gultsch2014-12-251-2/+4
|\ \ | |/ |/|
| * Show server info option when blocking is unavailablepulser2014-12-241-2/+4
|/
* Merge pull request #807 from SamWhited/developmentDaniel Gultsch2014-12-231-0/+8
|\
| * 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
|/
* Merge pull request #805 from SamWhited/removeoldvalidatorDaniel Gultsch2014-12-233-105/+77
|\
| * Remove old JID validatorSam Whited2014-12-233-105/+77
|/
* Merge pull request #804 from SamWhited/server-infoDaniel Gultsch2014-12-234-6/+150
|\
| * Add more server compatibility info.Sam Whited2014-12-234-6/+150
|/
* Merge branch 'SamWhited-verifyServerIqs' into developmentiNPUTmice2014-12-235-124/+102
|\
| * made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
| * Simplify roster handling codeSam Whited2014-12-223-121/+97
| * Merge pull request #802 from SamWhited/blockingfixDaniel Gultsch2014-12-222-2/+4
|/|
| * Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
|/
* Merge pull request #796 from SamWhited/xep0191Daniel Gultsch2014-12-2244-904/+1485
|\
| * Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2244-904/+1485
|/