aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1569 from fiaxh/conference_one_other_occupantDaniel Gultsch2015-11-241-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 occupantfiaxh2015-11-151-20/+48
| |
* | Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-2453-1875/+138
|\ \ | | | | | | Use OpenPGP-API 9.0
| * | Sign empty statusfiaxh2015-11-092-3/+1
| | |
| * | Use OpenPGP-API 9.0fiaxh2015-11-0952-1874/+139
| |/
* | Merge pull request #1570 from fiaxh/pgp_pgpengine_nullpointer_fixDaniel Gultsch2015-11-241-3/+3
|\ \ | |/ |/| PGP fix
| * PgpEngine: Get account from conversation instead of from contact. fixes ↵fiaxh2015-11-151-3/+3
|/ | | | #1568, fixes #1544
* Move migration 19 before 17Andreas Straub2015-11-061-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 serverDaniel Gultsch2015-11-011-0/+12
|
* don't close socket on disconnectDaniel Gultsch2015-11-011-1/+0
|
* indicate cbe in chat message hintDaniel Gultsch2015-10-313-3/+26
|
* explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-317-16/+48
|
* versrion bump to 1.7.21.7.2Daniel Gultsch2015-10-301-2/+2
|
* fixed session objects not being build on start upDaniel Gultsch2015-10-302-2/+1
|
* Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-3011-75/+294
|\ | | | | PGP messages background decryption
| * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-282-2/+7
| |
| * Decrypt PGP messages in backgroundfiaxh2015-10-289-73/+287
| |
* | version bump to 1.7.11.7.1Daniel Gultsch2015-10-292-2/+5
| |
* | moved db calls made from UI into serial background threadDaniel Gultsch2015-10-291-5/+21
| |
* | avoid npe when checking for stream restartDaniel Gultsch2015-10-291-2/+4
| |
* | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-297-5/+47
| |
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-291-1/+1
|\|
| * Merge pull request #1523 from SamWhited/presence_sync_fixDaniel Gultsch2015-10-271-1/+1
| |\ | | | | | | Don't synchronize on non-final field
| | * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
| |/
* | load avatars in message adapter in background taskDaniel Gultsch2015-10-294-17/+115
| |
* | show encryption type in warned/red messagesDaniel Gultsch2015-10-283-0/+32
|/
* Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-269-1/+57
|\ | | | | Handle some orientation changes manually
| * Reset the margins manually after rotatingsaqura2015-10-268-1/+53
| |
| * Handle some orientation changes manuallysaqura2015-10-251-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.0Daniel Gultsch2015-10-251-2/+2
| |
* | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
|/ | | | fixes the menu not being shown after rotation in edit account details
* join muc even if initial conference configuration fetch failedDaniel Gultsch2015-10-222-2/+43
|
* fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
|
* version bump to 1.7.0-beta.2Daniel Gultsch2015-10-211-2/+2
|
* open unknown files with wildcard intentDaniel Gultsch2015-10-202-10/+15
|
* open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-204-88/+105
|
* move chat state reset from background switch to foreground switch to account ↵Daniel Gultsch2015-10-191-3/+3
| | | | for chat states sent in the mean time
* update last seen in mucs. fixes #1508Daniel Gultsch2015-10-191-1/+5
|
* add nick to bookmark when entering full jid in join conference dialogDaniel Gultsch2015-10-191-4/+6
|
* synchronize around the disco objectDaniel Gultsch2015-10-191-44/+53
|
* version bump to 1.7.0-betaDaniel Gultsch2015-10-172-2/+10
|
* disconnet in background threadDaniel Gultsch2015-10-171-1/+7
|
* only try EXTERNAL auth if client certificate is set for accountDaniel Gultsch2015-10-171-1/+1
|
* don't retry building broken omemo keysDaniel Gultsch2015-10-171-4/+15
|
* allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-172-3/+13
|
* load axolotl session cache on first device updateDaniel Gultsch2015-10-171-2/+6
|
* improved error reporting in trust keys activityDaniel Gultsch2015-10-177-22/+49
|
* introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-168-65/+190
| | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
* block code when doing unforced disconnectDaniel Gultsch2015-10-162-223/+220
|
* moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
|