Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | 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 |
| | | | | | DIGEST-MD5 seems to be broken for a lot of cases (OpenFire) switched priority of PLAIN to not cause any security errors | ||||
* | 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 |
| |\ | | | | | | | Several translation fixes | ||||
| | * | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 15 | -22/+8 |
| |/ | | | | | | | | | | | Remove untranslatable about message Escape single quote in NL translation | ||||
* / | 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 | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | 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 spelling in the docs / a method | ||||
| * | 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 |
|/ | | | | | Also rewrap at 80 chars (which looked to be what it was at in most places) | ||||
* | 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 |
| | | | | Fixes #260 | ||||
* | 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 |
| | |||||
* | Merge pull request #810 from kriztan/patch-2 | Daniel Gultsch | 2014-12-25 | 1 | -0/+20 |
|\ | | | | | Update german translations | ||||
| * | Update german translations | kriztan | 2014-12-25 | 1 | -0/+20 |
| | | |||||
* | | Merge pull request #809 from pulser/server-info-fix | Daniel Gultsch | 2014-12-25 | 1 | -2/+4 |
|\ \ | |/ |/| | Show server info option when blocking is unavailable | ||||
| * | Show server info option when blocking is unavailable | pulser | 2014-12-24 | 1 | -2/+4 |
|/ | | | | | | | | Current head of development branch doesn't show server information if blocking is disabled. This is due to slightly wrong logic on an if statement. This patch ensures only the blocking option is disabled when blocking is not supported by the server, and that the feature remains available. | ||||
* | Merge pull request #807 from SamWhited/development | Daniel Gultsch | 2014-12-23 | 1 | -0/+8 |
|\ | | | | | Misc minor bug fixes | ||||
| * | Don't allow user to register domain only jids | Sam Whited | 2014-12-23 | 1 | -0/+5 |
| | | |||||
| * | Don't show menu on create account screen | Sam Whited | 2014-12-23 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #805 from SamWhited/removeoldvalidator | Daniel Gultsch | 2014-12-23 | 3 | -105/+77 |
|\ | | | | | Remove old JID validator | ||||
| * | Remove old JID validator | Sam Whited | 2014-12-23 | 3 | -105/+77 |
|/ | |||||
* | Merge pull request #804 from SamWhited/server-info | Daniel Gultsch | 2014-12-23 | 4 | -6/+150 |
|\ | | | | | Server info | ||||
| * | Add more server compatibility info. | Sam Whited | 2014-12-23 | 4 | -6/+150 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide server info behind a checkbox. Add XEP-0352 support to the server info list Add XEP-0237 to server info list Add XEP-0352 support to the server info list Add MaM and Blocking to the account XEPs list Also add a toggle button to hide some of the list Rebase on current codebase Make MAM string more descriptive Change show more button to checkbox menu item Shorten `MAM (History)' to `MAM' Order XEP list and hide all by default Supress warning (which is wrong anyways) Change `Show more' to `Show more info' | ||||
* | Merge branch 'SamWhited-verifyServerIqs' into development | iNPUTmice | 2014-12-23 | 5 | -124/+102 |
|\ | |||||
| * | made method private that is no longer required to be public | iNPUTmice | 2014-12-23 | 1 | -1/+1 |
| | | |||||
| * | Simplify roster handling code | Sam Whited | 2014-12-22 | 3 | -121/+97 |
| | | | | | | | | | | | | Merge result handling code into IqParser Fixes #20 |