aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-223-7/+47
|\
| * 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
| |
* | bug fixed in updaterChristian S2015-10-222-108/+110
| |
* | Merge 'hlad/hlad' into developmentChristian S2015-10-222-0/+22
|\ \
| * | show resource in dynamic tagshlad2015-10-222-0/+22
| | |
* | | corrected german stringsChristian S2015-10-221-2/+2
| | |
* | | set Conversations + version as user-agent for update checkChristian S2015-10-201-0/+13
| | |
* | | add offline hint to subtitle if contact is offlineChristian S2015-10-201-1404/+1410
| | |
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-2010-143/+183
|\ \ \ | | |/ | |/|
| * | 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
| | |
* | | Update README.mdChristian S2015-10-201-5/+43
| | |
* | | Update CHANGELOG.mdChristian S2015-10-201-3/+10
| | |
* | | show lastseen as subtitle in chatviewChristian S2015-10-191-2/+3
| | |
* | | move received tick setttings from expert options into ui optionsChristian S2015-10-171-5/+5
| | |
* | | version 1.7.0Christian S2015-10-171-2/+2
| | |
* | | Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-10-1714-310/+484
|\ \ \
| * | | copy commitsChristian S2015-10-1714-310/+484
|/| | | | |/ /
| * | 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
| | |
* | | use standard namespace for httpuploadChristian S2015-10-161-1/+1
| | |
* | | version 1.6.13Christian S2015-10-161-2/+2
| | |
* | | corrected strings-deChristian S2015-10-161-11/+1
| | |
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1661-675/+1911
|\| |
| * | moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
| | |
| * | use constants for oids in xmppdomainverifierDaniel Gultsch2015-10-151-2/+5
| | |
| * | more checks for xmppdomainverifier and better wildcard handlingDaniel Gultsch2015-10-151-4/+10
| | |
| * | use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. ↵Daniel Gultsch2015-10-152-2/+116
| | | | | | | | | | | | fixes #1189
| * | pulled translations from transifexDaniel Gultsch2015-10-1426-26/+61
| | |
| * | changed some source stringsDaniel Gultsch2015-10-141-2/+2
| | |
| * | clear bitmap cache before running out of memoryDaniel Gultsch2015-10-141-0/+9
| | |
| * | make unread status and notifications presistent across restartsDaniel Gultsch2015-10-146-34/+74
| | |
| * | work with muc services that change the message idDaniel Gultsch2015-10-142-1/+3
| | |
| * | pulled translations from transifexDaniel Gultsch2015-10-137-453/+913
| | |
| * | cleaned up some code. log last tagDaniel Gultsch2015-10-131-8/+14
| | |
| * | Merge pull request #1500 from SafwatHalaby/readmeDaniel Gultsch2015-10-131-2/+2
| |\ \ | | | | | | | | Minor README changes
| | * | Minor README changesSafwat Halaby2015-10-131-2/+2
| | | |