aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2015-10-261-0/+1
|\
| * invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
* | 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
* | 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
* | | 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-208-92/+129
|\ \ \ | | |/ | |/|
| * | open unknown files with wildcard intentDaniel Gultsch2015-10-202-10/+15
| * | open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-202-28/+39
| * | 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
| * | 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
* | | show lastseen as subtitle in chatviewChristian S2015-10-191-2/+3
* | | copy commitsChristian S2015-10-1713-310/+482
|\| |
| * | 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-176-22/+47
| * | introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-168-65/+190
| * | block code when doing unforced disconnectDaniel Gultsch2015-10-162-223/+220
* | | use standard namespace for httpuploadChristian S2015-10-161-1/+1
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1629-197/+911
|\| |
| * | 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. fixe...Daniel Gultsch2015-10-152-2/+116
| * | 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
| * | cleaned up some code. log last tagDaniel Gultsch2015-10-131-8/+14
| * | set cursor to end of jid in edit accountDaniel Gultsch2015-10-131-2/+3
| * | add config variable to enable x509 verificationDaniel Gultsch2015-10-124-24/+28
| * | code clean upDaniel Gultsch2015-10-1211-47/+19
| * | enable SASL EXTERNAL (certificate loginDaniel Gultsch2015-10-112-3/+90
| * | add menu item in account details to renew certificateDaniel Gultsch2015-10-115-60/+217
| * | Clean upAndreas Straub2015-10-112-13/+5
| * | Improve InvalidJidException handling in Jid classAndreas Straub2015-10-111-2/+2
| * | Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-115-24/+235
| |\ \
| | * | Captcha support.Armin Novak2015-10-115-24/+235
| * | | prevent null pointer when trying to display device fingerprints of not existi...Daniel Gultsch2015-10-111-0/+3
| |/ /
| * | initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-095-44/+146
* | | make success false as standardChristian S.2015-10-141-1/+1
* | | check if update server answers successfully...Christian S.2015-10-141-1/+7