Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-22 | 3 | -7/+47 |
|\ | |||||
| * | join muc even if initial conference configuration fetch failed | Daniel Gultsch | 2015-10-22 | 2 | -2/+43 |
| | | |||||
| * | fixed read conversations showing up as notifications after a restart | Daniel Gultsch | 2015-10-21 | 1 | -5/+4 |
| | | |||||
| * | version bump to 1.7.0-beta.2 | Daniel Gultsch | 2015-10-21 | 1 | -2/+2 |
| | | |||||
* | | bug fixed in updater | Christian S | 2015-10-22 | 2 | -108/+110 |
| | | |||||
* | | Merge 'hlad/hlad' into development | Christian S | 2015-10-22 | 2 | -0/+22 |
|\ \ | |||||
| * | | show resource in dynamic tags | hlad | 2015-10-22 | 2 | -0/+22 |
| | | | |||||
* | | | corrected german strings | Christian S | 2015-10-22 | 1 | -2/+2 |
| | | | |||||
* | | | set Conversations + version as user-agent for update check | Christian S | 2015-10-20 | 1 | -0/+13 |
| | | | |||||
* | | | add offline hint to subtitle if contact is offline | Christian S | 2015-10-20 | 1 | -1404/+1410 |
| | | | |||||
* | | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-20 | 10 | -143/+183 |
|\ \ \ | | |/ | |/| | |||||
| * | | open unknown files with wildcard intent | Daniel Gultsch | 2015-10-20 | 2 | -10/+15 |
| | | | |||||
| * | | open manage account + certificate chooser when cbe mode is enabled | Daniel Gultsch | 2015-10-20 | 4 | -88/+105 |
| | | | |||||
| * | | move chat state reset from background switch to foreground switch to account ↵ | Daniel Gultsch | 2015-10-19 | 1 | -3/+3 |
| | | | | | | | | | | | | for chat states sent in the mean time | ||||
| * | | update last seen in mucs. fixes #1508 | Daniel Gultsch | 2015-10-19 | 1 | -1/+5 |
| | | | |||||
| * | | add nick to bookmark when entering full jid in join conference dialog | Daniel Gultsch | 2015-10-19 | 1 | -4/+6 |
| | | | |||||
| * | | synchronize around the disco object | Daniel Gultsch | 2015-10-19 | 1 | -44/+53 |
| | | | |||||
| * | | version bump to 1.7.0-beta | Daniel Gultsch | 2015-10-17 | 2 | -2/+10 |
| | | | |||||
| * | | disconnet in background thread | Daniel Gultsch | 2015-10-17 | 1 | -1/+7 |
| | | | |||||
| * | | only try EXTERNAL auth if client certificate is set for account | Daniel Gultsch | 2015-10-17 | 1 | -1/+1 |
| | | | |||||
* | | | Update README.md | Christian S | 2015-10-20 | 1 | -5/+43 |
| | | | |||||
* | | | Update CHANGELOG.md | Christian S | 2015-10-20 | 1 | -3/+10 |
| | | | |||||
* | | | show lastseen as subtitle in chatview | Christian S | 2015-10-19 | 1 | -2/+3 |
| | | | |||||
* | | | move received tick setttings from expert options into ui options | Christian S | 2015-10-17 | 1 | -5/+5 |
| | | | |||||
* | | | version 1.7.0 | Christian S | 2015-10-17 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'refs/heads/siacs-master' into development | Christian S | 2015-10-17 | 14 | -310/+484 |
|\ \ \ | |||||
| * | | | copy commits | Christian S | 2015-10-17 | 14 | -310/+484 |
|/| | | | |/ / | |||||
| * | | don't retry building broken omemo keys | Daniel Gultsch | 2015-10-17 | 1 | -4/+15 |
| | | | |||||
| * | | allow redownloading files from remote hosts. fixes #1504 | Daniel Gultsch | 2015-10-17 | 2 | -3/+13 |
| | | | |||||
| * | | load axolotl session cache on first device update | Daniel Gultsch | 2015-10-17 | 1 | -2/+6 |
| | | | |||||
| * | | improved error reporting in trust keys activity | Daniel Gultsch | 2015-10-17 | 7 | -22/+49 |
| | | | |||||
| * | | introduced code to verify omemo device keys with x509 certificates. | Daniel Gultsch | 2015-10-16 | 8 | -65/+190 |
| | | | | | | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do | ||||
| * | | block code when doing unforced disconnect | Daniel Gultsch | 2015-10-16 | 2 | -223/+220 |
| | | | |||||
* | | | 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 |
| | | | |