Vincent Breitmoser 38d8f4be52 Merge remote-tracking branch 'origin/master' into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/values/strings.xml

2015-05-28 23:05:41 +02:00

..

compatibility

Update license header for 2014

2014-04-13 17:27:22 +02:00

keyimport

Cleanup in HkpKeyserver

2015-04-20 13:53:00 +02:00

operations

warn on signature earlier than key creation, err on significantly earlier

2015-05-28 16:33:45 +02:00

pgp

Merge remote-tracking branch 'origin/master' into development

2015-05-28 23:05:41 +02:00

provider

improve robustness of SecretKeyType handling

2015-05-28 22:34:02 +02:00

remote

don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes

2015-05-28 16:33:45 +02:00

service

Merge remote-tracking branch 'origin/master' into development

2015-05-28 23:05:41 +02:00

ui

Merge remote-tracking branch 'origin/master' into development

2015-05-28 23:05:41 +02:00

util

fixed sync on key import, 'me' linked contact crash

2015-05-08 19:05:21 +05:30

Constants.java

File extensions into Constants

2015-03-17 13:22:13 +01:00

KeychainApplication.java

revert unneeded changes for old temp Bluetooth share file

2015-05-04 17:15:10 -04:00