aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* hide subject edit button if not editable by userDaniel Gultsch2015-11-264-5/+30
* encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
* detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-263-5/+49
* version bump to 1.7.3Daniel Gultsch2015-11-261-2/+2
* removed unnecessary configuration fetch after joinDaniel Gultsch2015-11-261-1/+1
* removed unecessary chat stateDaniel Gultsch2015-11-261-1/+1
* fail jingle file transfer if axolotl key message could not be created. fixes ...Daniel Gultsch2015-11-261-1/+5
* pgp fixes and revert configuration changesDaniel Gultsch2015-11-2516-134/+91
* Merge pull request #1569 from fiaxh/conference_one_other_occupantDaniel Gultsch2015-11-241-20/+48
|\
| * 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
|\ \
| * | 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
|\ \ | |/ |/|
| * PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
|/
* Move migration 19 before 17Andreas Straub2015-11-061-3/+6
* 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
|\
| * 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 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
|\
| * Reset the margins manually after rotatingsaqura2015-10-268-1/+53
| * Handle some orientation changes manuallysaqura2015-10-251-0/+4
* | version bump to 1.7.01.7.0Daniel Gultsch2015-10-251-2/+2
* | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
|/
* 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
* 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