aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* block code when doing unforced disconnectDaniel Gultsch2015-10-162-223/+220
* 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 logincbeDaniel 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
* do not dismiss editAccountActivity when still trying to register new accountDaniel Gultsch2015-10-091-1/+3
* catch exception when unregistering receivers that have not been registered be...Daniel Gultsch2015-10-081-3/+11
* removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
* introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-087-28/+122
* add xhtml image tag to unencrypted image urls. add oob tag to all files that ...Daniel Gultsch2015-10-071-2/+18
* do mam query after joinDaniel Gultsch2015-10-061-1/+3
* Use MAM for MUC initial history retrievalsaqura2015-10-062-28/+66
* Properly check for MUC MAM supportsaqura2015-10-061-6/+8
* Show whether MAM is supported in MUCssaqura2015-10-063-2/+47
* changed store path for filesDaniel Gultsch2015-10-061-20/+10
* clean up log exporting service. properly end service after exportingDaniel Gultsch2015-10-061-102/+106
* clear notification and activate grace period when receiving chat marker from ...Daniel Gultsch2015-10-061-1/+5
* pulled translations from transifexDaniel Gultsch2015-10-056-132/+153
* try to catch plattform bugs1.6.11Daniel Gultsch2015-10-021-1/+6
* increased version codeDaniel Gultsch2015-10-021-1/+1
* properly recycle bitmapsDaniel Gultsch2015-10-021-4/+16
* don't put conference joins into pending on initial bindDaniel Gultsch2015-10-011-11/+14