Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use standard namespace for httpupload | Christian S | 2015-10-16 | 1 | -1/+1 |
| | |||||
* | version 1.6.13 | Christian S | 2015-10-16 | 1 | -2/+2 |
| | |||||
* | corrected strings-de | Christian S | 2015-10-16 | 1 | -11/+1 |
| | |||||
* | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 61 | -675/+1911 |
|\ | |||||
| * | moved other name parsing into seperate method | Daniel Gultsch | 2015-10-15 | 1 | -40/+45 |
| | | |||||
| * | use constants for oids in xmppdomainverifier | Daniel Gultsch | 2015-10-15 | 1 | -2/+5 |
| | | |||||
| * | more checks for xmppdomainverifier and better wildcard handling | Daniel Gultsch | 2015-10-15 | 1 | -4/+10 |
| | | |||||
| * | use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. ↵ | Daniel Gultsch | 2015-10-15 | 2 | -2/+116 |
| | | | | | | | | fixes #1189 | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-10-14 | 26 | -26/+61 |
| | | |||||
| * | changed some source strings | Daniel Gultsch | 2015-10-14 | 1 | -2/+2 |
| | | |||||
| * | clear bitmap cache before running out of memory | Daniel Gultsch | 2015-10-14 | 1 | -0/+9 |
| | | |||||
| * | make unread status and notifications presistent across restarts | Daniel Gultsch | 2015-10-14 | 6 | -34/+74 |
| | | |||||
| * | work with muc services that change the message id | Daniel Gultsch | 2015-10-14 | 2 | -1/+3 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-10-13 | 7 | -453/+913 |
| | | |||||
| * | cleaned up some code. log last tag | Daniel Gultsch | 2015-10-13 | 1 | -8/+14 |
| | | |||||
| * | Merge pull request #1500 from SafwatHalaby/readme | Daniel Gultsch | 2015-10-13 | 1 | -2/+2 |
| |\ | | | | | | | Minor README changes | ||||
| | * | Minor README changes | Safwat Halaby | 2015-10-13 | 1 | -2/+2 |
| | | | |||||
| * | | set cursor to end of jid in edit account | Daniel Gultsch | 2015-10-13 | 1 | -2/+3 |
| | | | |||||
| * | | add config variable to enable x509 verification | Daniel Gultsch | 2015-10-12 | 6 | -27/+31 |
| | | | |||||
| * | | code clean up | Daniel Gultsch | 2015-10-12 | 11 | -47/+19 |
| | | | |||||
| * | | enable SASL EXTERNAL (certificate login | Daniel Gultsch | 2015-10-11 | 2 | -3/+90 |
| | | | |||||
| * | | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 7 | -61/+228 |
| | | | |||||
| * | | make add account from key visible | Daniel Gultsch | 2015-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | Clean up | Andreas Straub | 2015-10-11 | 2 | -13/+5 |
| | | | | | | | | | | | | Fixes some random linter warnings. | ||||
| * | | Improve InvalidJidException handling in Jid class | Andreas Straub | 2015-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | This code should never be triggered anway, so with this 'fix', we should at least get more meaningful stack traces. Plus, it makes the linter happy by preventing NullPointerExceptions. | ||||
| * | | Merge pull request #1461 from akallabeth/captcha_support | Daniel Gultsch | 2015-10-11 | 6 | -24/+238 |
| |\ \ | | | | | | | | | Implemented account registration with captcha | ||||
| | * | | Captcha support. | Armin Novak | 2015-10-11 | 6 | -24/+238 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-11 | 2 | -7/+5 |
| |\| | | |||||
| | * | | Merge pull request #1482 from SafwatHalaby/readme | Daniel Gultsch | 2015-10-10 | 1 | -5/+3 |
| | |\ \ | | | |/ | | |/| | Added OMEMO to Readme | ||||
| | | * | Added OMEMO to Readme | Safwat Halaby | 2015-10-10 | 1 | -5/+3 |
| | |/ | |||||
| | * | Merge pull request #1480 from SafwatHalaby/patch-1 | Andreas Straub | 2015-10-10 | 1 | -1/+1 |
| | |\ | | | | | | | | | Update build system in README | ||||
| | | * | Update build system in README | Safwat Halaby | 2015-10-10 | 1 | -1/+1 |
| | |/ | | | | | | | Fixes #1479. | ||||
| | * | Merge pull request #1478 from SafwatHalaby/patch-1 | Daniel Gultsch | 2015-10-10 | 1 | -1/+1 |
| | |\ | | | | | | | | | Fixed a typo in string.xml | ||||
| | | * | Fixed a typo in string.xml | Safwat Halaby | 2015-10-10 | 1 | -1/+1 |
| | |/ | |||||
| * / | prevent null pointer when trying to display device fingerprints of not ↵ | Daniel Gultsch | 2015-10-11 | 1 | -0/+3 |
| |/ | | | | | | | existing sessions | ||||
| * | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 8 | -44/+156 |
| | | |||||
* | | make success false as standard | Christian S. | 2015-10-14 | 1 | -1/+1 |
| | | |||||
* | | check if update server answers successfully... | Christian S. | 2015-10-14 | 1 | -1/+7 |
| | | | | | | ...and finish activity if not | ||||
* | | changelog | Christian S | 2015-10-13 | 1 | -0/+1 |
| | | |||||
* | | changed update url | Christian S | 2015-10-13 | 1 | -1/+1 |
| | | |||||
* | | updated german strings | Christian S | 2015-10-10 | 1 | -2/+2 |
| | | |||||
* | | updated changelog | Christian S | 2015-10-10 | 1 | -3/+5 |
| | | |||||
* | | version 1.6.13 beta | Christian S | 2015-10-10 | 1 | -1/+1 |
| | | |||||
* | | show encryption in ui | Christian S | 2015-10-10 | 1 | -2/+2 |
| | | |||||
* | | update missing strings | Christian S | 2015-10-10 | 2 | -0/+10 |
| | | |||||
* | | updated AppUpdater a bit | Christian S | 2015-10-10 | 5 | -73/+52 |
| | | |||||
* | | copy commits | Christian S | 2015-10-10 | 9 | -34/+136 |
|\| | |||||
| * | do not dismiss editAccountActivity when still trying to register new account | Daniel Gultsch | 2015-10-09 | 1 | -1/+3 |
| | | |||||
| * | catch exception when unregistering receivers that have not been registered ↵ | Daniel Gultsch | 2015-10-08 | 1 | -3/+11 |
| | | | | | | | | before | ||||
| * | removed oob element from file messages | Daniel Gultsch | 2015-10-08 | 1 | -1/+0 |
| | |