aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #829 from kriztan/patch-1Daniel Gultsch2015-01-041-1/+1
|\ | | | | corrected German 'private_message_to'
| * corrected German 'private_message_to'kriztan2015-01-041-1/+1
| |
* | Merge pull request #830 from kruks23/translation4Daniel Gultsch2015-01-041-1/+15
|\ \ | |/ |/| Update spanish translations
| * Update spanish translationssergio2015-01-041-1/+15
|/
* no longer use ConcurrentHashMap in favor of synchronize on a final HashMapDaniel Gultsch2015-01-041-19/+27
|
* Merge branch 'development'0.10Daniel Gultsch2015-01-031-5/+11
|\
| * Merge pull request #827 from kriztan/patch-2Daniel Gultsch2015-01-031-5/+11
| |\ | | | | | | Added and modified German translations
| | * Added and modified German translationskriztan2015-01-031-5/+11
| |/
* / version bump to 0.10Daniel Gultsch2015-01-033-3/+13
|/
* void messages getting reloaded through mam after clear historyDaniel Gultsch2015-01-031-0/+1
|
* record voice and attachment refactorDaniel Gultsch2015-01-035-74/+73
|
* disable / enable all accountsDaniel Gultsch2015-01-033-27/+103
|
* update last presence only for messagesDaniel Gultsch2015-01-032-6/+2
|
* added missing layout fileDaniel Gultsch2015-01-031-0/+105
|
* code cleanupDaniel Gultsch2015-01-033-11/+22
|
* migrated change password into separate activityDaniel Gultsch2015-01-036-88/+138
|
* some further otr improvementsDaniel Gultsch2015-01-026-9/+31
|
* click on dynamic tag to filter for that tagDaniel Gultsch2015-01-022-0/+34
|
* 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 translations
| | * 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
| | | | | DIGEST-MD5 seems to be broken for a lot of cases (OpenFire) switched priority of PLAIN to not cause any security errors
* 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
| |\ | | | | | | Several translation fixes
| | * Make `app_name' string untranslatableSam Whited2014-12-2915-22/+8
| |/ | | | | | | | | | | Remove untranslatable about message Escape single quote in NL translation
* / 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 translations
| * Update german translationskriztan2014-12-271-0/+4
| |
* | Merge pull request #813 from plsng/translationDaniel Gultsch2014-12-302-114/+292
|\ \ | | | | | | Update Dutch translations
| * | 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 translations
| * | Update spanish translationssergio2014-12-271-3/+27
| |/
* | Merge pull request #819 from SamWhited/spellingDaniel Gultsch2014-12-307-58/+58
|\ \ | |/ |/| Fix spelling in the docs / a method
| * 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
|/ | | | | Also rewrap at 80 chars (which looked to be what it was at in most places)
* 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
| | | | Fixes #260
* proper call to invalidateViews()Daniel Gultsch2014-12-251-1/+1
|
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
|