aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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. fixe...Daniel Gultsch2015-10-152-2/+116
| * 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 changesSafwat Halaby2015-10-131-2/+2
| * | set cursor to end of jid in edit accountDaniel Gultsch2015-10-131-2/+3
| * | add config variable to enable x509 verificationDaniel Gultsch2015-10-126-27/+31
| * | 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-117-61/+228
| * | make add account from key visibleDaniel Gultsch2015-10-111-1/+1
| * | 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-116-24/+238
| |\ \
| | * | Captcha support.Armin Novak2015-10-116-24/+238
| * | | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-112-7/+5
| |\| |
| | * | Merge pull request #1482 from SafwatHalaby/readmeDaniel Gultsch2015-10-101-5/+3
| | |\ \ | | | |/ | | |/|
| | | * Added OMEMO to ReadmeSafwat Halaby2015-10-101-5/+3
| | |/
| | * Merge pull request #1480 from SafwatHalaby/patch-1Andreas Straub2015-10-101-1/+1
| | |\
| | | * Update build system in READMESafwat Halaby2015-10-101-1/+1
| | |/
| | * Merge pull request #1478 from SafwatHalaby/patch-1Daniel Gultsch2015-10-101-1/+1
| | |\
| | | * Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| | |/
| * / 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-098-44/+156
* | make success false as standardChristian S.2015-10-141-1/+1