Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 29 | -197/+911 |
|\ | |||||
| * | 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 | ||||
| * | 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 |
| | | |||||
| * | cleaned up some code. log last tag | Daniel Gultsch | 2015-10-13 | 1 | -8/+14 |
| | | |||||
| * | 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 | 4 | -24/+28 |
| | | |||||
| * | 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 | 5 | -60/+217 |
| | | |||||
| * | 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 | 5 | -24/+235 |
| |\ | | | | | | | Implemented account registration with captcha | ||||
| | * | Captcha support. | Armin Novak | 2015-10-11 | 5 | -24/+235 |
| | | | |||||
| * | | 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 | 5 | -44/+146 |
| | | |||||
* | | 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 | ||||
* | | changed update url | Christian S | 2015-10-13 | 1 | -1/+1 |
| | | |||||
* | | show encryption in ui | Christian S | 2015-10-10 | 1 | -2/+2 |
| | | |||||
* | | updated AppUpdater a bit | Christian S | 2015-10-10 | 3 | -63/+45 |
| | | |||||
* | | copy commits | Christian S | 2015-10-10 | 6 | -32/+117 |
|\| | |||||
| * | 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 |
| | | |||||
| * | introduced expert options to set status to away and xa if screen is off or ↵ | Daniel Gultsch | 2015-10-08 | 4 | -28/+104 |
| | | | | | | | | if phone is silenced | ||||
* | | changed log outputs of updater and delete old... | Christian S | 2015-10-10 | 2 | -17/+29 |
| | | | | | | | | ...downloaded files before downloading update | ||||
* | | Merge branch 'Update_Startup' into development | Christian S | 2015-10-07 | 2 | -2/+16 |
|\ \ | |||||
| * | | update Updater | Christian S | 2015-10-06 | 1 | -1/+12 |
| | | | |||||
| * | | added changelog to JSON object in updater | Christian S. | 2015-10-06 | 1 | -1/+2 |
| | | | |||||
| * | | Added more info to alertbox | Christian S. | 2015-10-06 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2015-10-07 | 9 | -165/+254 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | add xhtml image tag to unencrypted image urls. add oob tag to all files that ↵ | Daniel Gultsch | 2015-10-07 | 1 | -2/+18 |
| | | | | | | | | are on remote hosts | ||||
| * | do mam query after join | Daniel Gultsch | 2015-10-06 | 1 | -1/+3 |
| | | |||||
| * | Use MAM for MUC initial history retrieval | saqura | 2015-10-06 | 2 | -28/+66 |
| | | | | | | | | | | If the MUC supports MAM (XEP-0313), use it to retrieve the history when joining. | ||||
| * | Properly check for MUC MAM support | saqura | 2015-10-06 | 1 | -6/+8 |
| | | | | | | | | | | | | Only use MAM (XEP-0313) in MUCs if it is supported. This should fix #1264 | ||||
| * | Show whether MAM is supported in MUCs | saqura | 2015-10-06 | 2 | -1/+17 |
| | | | | | | | | | | The conference details in "Advanced Mode" now indicate whether MAM is supported by the conference server. | ||||
| * | changed store path for files | Daniel Gultsch | 2015-10-06 | 1 | -20/+10 |
| | | |||||
| * | clean up log exporting service. properly end service after exporting | Daniel Gultsch | 2015-10-06 | 1 | -102/+106 |
| | | |||||
| * | clear notification and activate grace period when receiving chat marker from ↵ | Daniel Gultsch | 2015-10-06 | 1 | -1/+5 |
| | | | | | | | | another instance | ||||
| * | try to catch plattform bugs | Daniel Gultsch | 2015-10-02 | 1 | -1/+6 |
| | | |||||
| * | properly recycle bitmaps | Daniel Gultsch | 2015-10-02 | 1 | -4/+16 |
| | | |||||
* | | Merge pull request #43 from siacs/master | Christian S. | 2015-10-03 | 1 | -14/+16 |
|\| | | | | | copy commits | ||||
| * | don't put conference joins into pending on initial bind | Daniel Gultsch | 2015-10-01 | 1 | -11/+14 |
| | | |||||
| * | reset muc options immediately befor join | Daniel Gultsch | 2015-10-01 | 1 | -3/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-10-01 | 8 | -35/+124 |
|\| |