Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fail jingle file transfer if axolotl key message could not be created. fixes ↵ | Daniel Gultsch | 2015-11-26 | 1 | -1/+5 |
| | | | | #1576 | ||||
* | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 16 | -134/+91 |
| | |||||
* | Merge pull request #1569 from fiaxh/conference_one_other_occupant | Daniel Gultsch | 2015-11-24 | 1 | -20/+48 |
|\ | | | | | Show own avatar in tile for conferences with only one other occupant next to theirs | ||||
| * | Own contact picture in tile for conferences with only one other occupant | fiaxh | 2015-11-15 | 1 | -20/+48 |
| | | |||||
* | | Merge pull request #1558 from fiaxh/pgp_api_9.0 | Daniel Gultsch | 2015-11-24 | 53 | -1875/+138 |
|\ \ | | | | | | | Use OpenPGP-API 9.0 | ||||
| * | | Sign empty status | fiaxh | 2015-11-09 | 2 | -3/+1 |
| | | | |||||
| * | | Use OpenPGP-API 9.0 | fiaxh | 2015-11-09 | 52 | -1874/+139 |
| |/ | |||||
* | | Merge pull request #1570 from fiaxh/pgp_pgpengine_nullpointer_fix | Daniel Gultsch | 2015-11-24 | 1 | -3/+3 |
|\ \ | |/ |/| | PGP fix | ||||
| * | PgpEngine: Get account from conversation instead of from contact. fixes ↵ | fiaxh | 2015-11-15 | 1 | -3/+3 |
|/ | | | | #1568, fixes #1544 | ||||
* | Move migration 19 before 17 | Andreas Straub | 2015-11-06 | 1 | -3/+6 |
| | | | | | | | | | Migration 17 depends on Account deserialization, so any migrations that touch the accounts table need to be applied beforehand. Re-writing the migration to work directly on the database would lead to a lot of code duplication, so it's not worth it at this time, but might become necessary later on to avoid dependency cycles. | ||||
* | updated FAQ to account for incompatible server | Daniel Gultsch | 2015-11-01 | 1 | -0/+12 |
| | |||||
* | don't close socket on disconnect | Daniel Gultsch | 2015-11-01 | 1 | -1/+0 |
| | |||||
* | indicate cbe in chat message hint | Daniel Gultsch | 2015-10-31 | 3 | -3/+26 |
| | |||||
* | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 7 | -16/+48 |
| | |||||
* | versrion bump to 1.7.21.7.2 | Daniel Gultsch | 2015-10-30 | 1 | -2/+2 |
| | |||||
* | 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 | 11 | -75/+294 |
|\ | | | | | PGP messages background decryption | ||||
| * | Show PGP "please wait" message only when actually decrypting | fiaxh | 2015-10-28 | 2 | -2/+7 |
| | | |||||
| * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 9 | -73/+287 |
| | | |||||
* | | version bump to 1.7.11.7.1 | Daniel Gultsch | 2015-10-29 | 2 | -2/+5 |
| | | |||||
* | | 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 |
|\| | |||||
| * | Merge pull request #1523 from SamWhited/presence_sync_fix | Daniel Gultsch | 2015-10-27 | 1 | -1/+1 |
| |\ | | | | | | | Don't synchronize on non-final field | ||||
| | * | 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 | 4 | -17/+115 |
| | | |||||
* | | show encryption type in warned/red messages | Daniel Gultsch | 2015-10-28 | 3 | -0/+32 |
|/ | |||||
* | Merge pull request #1520 from saqura/self_handle_orientation | Daniel Gultsch | 2015-10-26 | 9 | -1/+57 |
|\ | | | | | Handle some orientation changes manually | ||||
| * | Reset the margins manually after rotating | saqura | 2015-10-26 | 8 | -1/+53 |
| | | |||||
| * | Handle some orientation changes manually | saqura | 2015-10-25 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently most activities get destroyed/recreated when rotating the device. This commit prevents this from happening where it is not necessary. The most obvious improvements are: * The options menu in the EditAccountActivity does not disappear when rotating the device. * CSI inactive/active states are no longer sent on every rotate. | ||||
* | | version bump to 1.7.01.7.0 | Daniel Gultsch | 2015-10-25 | 1 | -2/+2 |
| | | |||||
* | | 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 | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 |