Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #829 from kriztan/patch-1 | Daniel Gultsch | 2015-01-04 | 1 | -1/+1 |
|\ | |||||
| * | corrected German 'private_message_to' | kriztan | 2015-01-04 | 1 | -1/+1 |
* | | Merge pull request #830 from kruks23/translation4 | Daniel Gultsch | 2015-01-04 | 1 | -1/+15 |
|\ \ | |/ |/| | |||||
| * | Update spanish translations | sergio | 2015-01-04 | 1 | -1/+15 |
|/ | |||||
* | no longer use ConcurrentHashMap in favor of synchronize on a final HashMap | Daniel Gultsch | 2015-01-04 | 1 | -19/+27 |
* | Merge branch 'development'0.10 | Daniel Gultsch | 2015-01-03 | 1 | -5/+11 |
|\ | |||||
| * | Merge pull request #827 from kriztan/patch-2 | Daniel Gultsch | 2015-01-03 | 1 | -5/+11 |
| |\ | |||||
| | * | Added and modified German translations | kriztan | 2015-01-03 | 1 | -5/+11 |
| |/ | |||||
* / | version bump to 0.10 | Daniel Gultsch | 2015-01-03 | 3 | -3/+13 |
|/ | |||||
* | void messages getting reloaded through mam after clear history | Daniel Gultsch | 2015-01-03 | 1 | -0/+1 |
* | record voice and attachment refactor | Daniel Gultsch | 2015-01-03 | 5 | -74/+73 |
* | disable / enable all accounts | Daniel Gultsch | 2015-01-03 | 3 | -27/+103 |
* | update last presence only for messages | Daniel Gultsch | 2015-01-03 | 2 | -6/+2 |
* | added missing layout file | Daniel Gultsch | 2015-01-03 | 1 | -0/+105 |
* | code cleanup | Daniel Gultsch | 2015-01-03 | 3 | -11/+22 |
* | migrated change password into separate activity | Daniel Gultsch | 2015-01-03 | 6 | -88/+138 |
* | some further otr improvements | Daniel Gultsch | 2015-01-02 | 6 | -9/+31 |
* | click on dynamic tag to filter for that tag | Daniel Gultsch | 2015-01-02 | 2 | -0/+34 |
* | Merge remote-tracking branch 'origin/development' into development | Daniel Gultsch | 2015-01-02 | 1 | -0/+7 |
|\ | |||||
| * | Merge pull request #826 from kriztan/patch-1 | Daniel Gultsch | 2015-01-02 | 1 | -0/+7 |
| |\ | |||||
| | * | Added German translations | kriztan | 2015-01-02 | 1 | -0/+7 |
* | | | allow cancellation of waiting files | Daniel Gultsch | 2015-01-02 | 2 | -19/+23 |
|/ / | |||||
* / | put Conversations into background mode earlier | Daniel Gultsch | 2015-01-02 | 5 | -19/+44 |
|/ | |||||
* | prefer PLAIN over DIGEST-MD5 | Daniel Gultsch | 2015-01-02 | 2 | -3/+3 |
* | fixed layout file | Daniel Gultsch | 2015-01-02 | 1 | -1/+1 |
* | improved OTR verification part one | Daniel Gultsch | 2015-01-02 | 12 | -352/+403 |
* | Merge remote-tracking branch 'origin/development' into development | Daniel Gultsch | 2014-12-30 | 15 | -22/+8 |
|\ | |||||
| * | Merge pull request #821 from SamWhited/appnametranslation | Daniel Gultsch | 2014-12-30 | 15 | -22/+8 |
| |\ | |||||
| | * | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 15 | -22/+8 |
| |/ | |||||
* / | improved fromServer filter | Daniel Gultsch | 2014-12-30 | 1 | -1/+4 |
|/ | |||||
* | refactor swithOverToTls stuff | Daniel Gultsch | 2014-12-30 | 1 | -56/+45 |
* | fixed npe in block menu item | Daniel Gultsch | 2014-12-30 | 1 | -1/+1 |
* | fixed nl strings | Daniel Gultsch | 2014-12-30 | 1 | -25/+1 |
* | fixed #818 | Daniel Gultsch | 2014-12-30 | 1 | -1/+1 |
* | Merge pull request #812 from kriztan/patch-1 | Daniel Gultsch | 2014-12-30 | 1 | -0/+4 |
|\ | |||||
| * | Update german translations | kriztan | 2014-12-27 | 1 | -0/+4 |
* | | Merge pull request #813 from plsng/translation | Daniel Gultsch | 2014-12-30 | 2 | -114/+292 |
|\ \ | |||||
| * | | Update Dutch translations | Nathan Follens | 2014-12-29 | 2 | -10/+10 |
| * | | Update Dutch translations | Nathan Follens | 2014-12-27 | 2 | -113/+291 |
| |/ | |||||
* | | Merge pull request #814 from kruks23/translation1 | Daniel Gultsch | 2014-12-30 | 1 | -3/+27 |
|\ \ | |||||
| * | | Update spanish translations | sergio | 2014-12-27 | 1 | -3/+27 |
| |/ | |||||
* | | Merge pull request #819 from SamWhited/spelling | Daniel Gultsch | 2014-12-30 | 7 | -58/+58 |
|\ \ | |/ |/| | |||||
| * | Fix typo in method name | Sam Whited | 2014-12-29 | 5 | -9/+9 |
| * | Rename observations doc file | Sam Whited | 2014-12-29 | 1 | -0/+0 |
| * | Fix spelling in the docs | Sam Whited | 2014-12-28 | 2 | -49/+49 |
|/ | |||||
* | code cleanup for change password stuff | Daniel Gultsch | 2014-12-25 | 3 | -15/+22 |
* | added callback to change account password to notify UI on success / failure | Daniel Gultsch | 2014-12-25 | 4 | -27/+66 |
* | Add ability to change password on server | Sam Whited | 2014-12-25 | 9 | -88/+139 |
* | proper call to invalidateViews() | Daniel Gultsch | 2014-12-25 | 1 | -1/+1 |
* | catch another exception in fingerprint generation | Daniel Gultsch | 2014-12-25 | 1 | -1/+1 |