Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | indicate cbe in chat message hint | Daniel Gultsch | 2015-10-31 | 2 | -1/+23 | |
| | | ||||||
| * | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 6 | -16/+46 | |
| | | ||||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 23 | -104/+549 | |
|\| | ||||||
| * | fixed session objects not being build on start up | Daniel Gultsch | 2015-10-30 | 2 | -2/+1 | |
| | | ||||||
| * | Merge pull request #1513 from fiaxh/pgp_background_decryption | Daniel Gultsch | 2015-10-30 | 10 | -74/+292 | |
| |\ | | | | | | | PGP messages background decryption | |||||
| | * | Show PGP "please wait" message only when actually decrypting | fiaxh | 2015-10-28 | 1 | -1/+5 | |
| | | | ||||||
| | * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 9 | -73/+287 | |
| | | | ||||||
| * | | moved db calls made from UI into serial background thread | Daniel Gultsch | 2015-10-29 | 1 | -5/+21 | |
| | | | ||||||
| * | | avoid npe when checking for stream restart | Daniel Gultsch | 2015-10-29 | 1 | -2/+4 | |
| | | | ||||||
| * | | push CN into nick pep node when uploading certificate. subscribe to nick node | Daniel Gultsch | 2015-10-29 | 7 | -5/+47 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-29 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Don't synchronize on non-final field | Sam Whited | 2015-10-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | load avatars in message adapter in background task | Daniel Gultsch | 2015-10-29 | 2 | -13/+111 | |
| | | | ||||||
| * | | show encryption type in warned/red messages | Daniel Gultsch | 2015-10-28 | 2 | -0/+21 | |
| |/ | ||||||
| * | Merge pull request #1520 from saqura/self_handle_orientation | Daniel Gultsch | 2015-10-26 | 5 | -1/+50 | |
| |\ | | | | | | | Handle some orientation changes manually | |||||
| | * | Reset the margins manually after rotating | saqura | 2015-10-26 | 5 | -1/+50 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2015-10-26 | 1 | -0/+1 | |
|\| | | ||||||
| * | | invalidate menu after backend connection. | Daniel Gultsch | 2015-10-25 | 1 | -0/+1 | |
| |/ | | | | | | | fixes the menu not being shown after rotation in edit account details | |||||
* | | 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 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | 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 | 8 | -92/+129 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | 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 | 2 | -28/+39 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
* | | | show lastseen as subtitle in chatview | Christian S | 2015-10-19 | 1 | -2/+3 | |
| | | | ||||||
* | | | copy commits | Christian S | 2015-10-17 | 13 | -310/+482 | |
|\| | | ||||||
| * | | 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 | 6 | -22/+47 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
* | | | 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 | |
| | | |