Commit log

2127fcb Merge branch 'development' of github.com:siacs/Conversations into development

iNPUTmice created

8a36958 fixed #446

iNPUTmice created

e6eef53 Merge pull request #445 from betheg/namespace

Click to expand commit body 
add proper namespace in carbon

Daniel Gultsch created

0d87390 add proper namespace in carbon

Michael created

83c3b33 Merge branch 'development'

iNPUTmice created

cee8980 Merge branch 'master' of github.com:siacs/Conversations

iNPUTmice created

73cba91 version bump to 0.7.1

iNPUTmice created

ca560ae updated swedish translations. thank you Anders Sandblad

iNPUTmice created

62cdd7c Merge pull request #441 from svetlemodry/master

Click to expand commit body 
Czech translation for Conversations

Daniel Gultsch created

00d2757 Created Czech strings.xml translation file

Jaroslav Lichtblau created

19488d3 czech arrays.xml file created

Jaroslav Lichtblau created

db81618 check if market is available before starting to install openkey chain

iNPUTmice created

c9a342f more formating

iNPUTmice created

12b62ad added missing strings back. + formating

iNPUTmice created

dee46f3 match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources

iNPUTmice created

ff41918 missed show=chat for send button colorization

iNPUTmice created

fef41ba pare body in type=normal messages as well

iNPUTmice created

7fd4f13 added something about delivery failed to readme

iNPUTmice created

31f1107 IT'S CHRISTMAS ALREADY!

iNPUTmice created

a6d4a9c started development on 0.8-alpha

iNPUTmice created

a1d6f91 added bookmarks to XEP list

iNPUTmice created

1cd5949 added a list of XEPs

iNPUTmice created

79a8c29 Merge pull request #435 from kruks23/translation4

Click to expand commit body 
Update Spanish Translations

Daniel Gultsch created

8d4ad58 Update Spanish Translations

kruks23 created

4b2e06b version bump, changelog and one last minute change for OTR

iNPUTmice created

c02ef80 Merge branch 'master' of github.com:siacs/Conversations

Click to expand commit body 
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java

iNPUTmice created

facb124 don't reset images from sending to waiting

iNPUTmice created

d92e838 setting to increase font size. fixed #420

iNPUTmice created

d9c4637 hide encryption settings under 'expert options'

iNPUTmice created

3f77e5f bumped openpgp-api to version 5

iNPUTmice created

1871521 simplefied some code that might have been the source for some strange bugs

iNPUTmice created

b23f8bd introduced downloadable interface. reverted some of the changes made to OTR

iNPUTmice created

a6f0f0c bug fixes for forcing encryption

iNPUTmice created

0be263d Work on Yubikey decryption

Dominik Schürmann created

5cb1139 fixed sending offline pgp messages

iNPUTmice created

58953e6 settings to force encryption and setting for not saving messages to disk. fixed #353

iNPUTmice created

3b9fd28 don't fail displayed or received messages

iNPUTmice created

19f98f5 warn on missing presence subscription

iNPUTmice created

409fdd8 Merge branch 'development' of github.com:siacs/Conversations into development

iNPUTmice created

449c2a5 fixed #321 - delete otr fingerprints

iNPUTmice created

2cebac6 Fix for user ids in API

Dominik Schürmann created

ac927df Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib

Dominik Schürmann created

f6d678c Fix nullpointer with new OpenPgpSignatureResult version

Dominik Schürmann created

5fe3f20 Merge pull request #426 from betheg/remove_strings

Click to expand commit body 
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.

Daniel Gultsch created

9094759 fixed #425

iNPUTmice created

f4d86ec deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.

Michael created

27ad80a trying to avoid rejectedexection

iNPUTmice created

04665b5 Merge pull request #424 from betheg/bookmark_password

Click to expand commit body 
MUC: set the password from bookmarks.

Daniel Gultsch created

ecd613d MUC: set the password from bookmarks.

Michael created

d9990e6 made shareing text with conferences possible again

iNPUTmice created