Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml

2014-06-18 21:09:04 +02:00

..

adapter

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

dialog

neatness refactoring

2014-06-04 20:27:25 +02:00

widget

new-edit: remove old save keyring stuff

2014-06-17 20:03:58 +02:00

CertifyKeyActivity.java

Merge remote-tracking branch 'origin/master' into wrapped-key-ring

2014-05-14 16:02:28 +02:00

DecryptActivity.java

Better handling of actionbars back

2014-05-07 14:33:20 +02:00

DecryptFileFragment.java

Moved Notify class to utils

2014-06-16 13:13:43 +02:00

DecryptFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

DecryptMessageFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

DrawerActivity.java

Workaround for nullpointer bug in support lib, close #591

2014-04-22 08:15:55 +02:00

EditKeyActivity.java

new-edit: remove old save keyring stuff

2014-06-17 20:03:58 +02:00

EncryptActivity.java

Better handling of actionbars back

2014-05-07 14:33:20 +02:00

EncryptActivityInterface.java

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

EncryptAsymmetricFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

EncryptFileFragment.java

ui: use textviews instead of bootstrap buttons in SignEncrypt

2014-05-06 19:18:32 +02:00

EncryptMessageFragment.java

ui: use textviews instead of bootstrap buttons in SignEncrypt

2014-05-06 19:18:32 +02:00

EncryptSymmetricFragment.java

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

HelpAboutFragment.java

Add applications section to help

2014-05-07 18:31:31 +02:00

HelpActivity.java

Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage

2014-06-06 22:47:28 +02:00

HelpHtmlFragment.java

Add applications section to help

2014-05-07 18:31:31 +02:00

ImportKeysActivity.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ImportKeysFileFragment.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ImportKeysKeybaseFragment.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ImportKeysListFragment.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ImportKeysQrCodeFragment.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ImportKeysServerFragment.java

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

KeyListActivity.java

add debug backup/restore options to main menu

2014-04-14 13:06:49 +02:00

KeyListFragment.java

Merge branch 'master' into automatic-contact-discovery

2014-06-05 23:56:29 +02:00

LoaderFragment.java

extract generic LoaderFragment superclass from KeyList

2014-05-08 13:43:59 +02:00

LogDisplayActivity.java

import-log: work on log fragment ui

2014-06-10 20:06:28 +02:00

LogDisplayFragment.java

import-log: use holder pattern in log fragment

2014-06-11 00:37:23 +02:00

PreferencesActivity.java

Remove unused strings, fix some lint errors, fix some language confusions

2014-04-18 20:41:39 +02:00

PreferencesKeyServerActivity.java

Remove unused strings, fix some lint errors, fix some language confusions

2014-04-18 20:41:39 +02:00

SelectPublicKeyActivity.java

Optimize imports

2014-04-15 22:52:21 +02:00

SelectPublicKeyFragment.java

Rename mCurQuery to mQuery for consistency

2014-05-16 11:38:43 +02:00

SelectSecretKeyActivity.java

split up filterSign and filterCertify in SelectSecretKeyFragment

2014-04-20 19:38:42 +02:00

SelectSecretKeyFragment.java

use long rather than String to build uris by key

2014-05-21 21:26:35 +02:00

SelectSecretKeyLayoutFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

UploadKeyActivity.java

Use flat buttons where appropriate

2014-05-08 15:46:57 +02:00

ViewCertActivity.java

neatness refactoring

2014-06-04 20:27:25 +02:00

ViewKeyActivity.java

Merge branch 'master' of github.com:open-keychain/open-keychain

2014-06-18 00:03:19 +02:00

ViewKeyCertsFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

ViewKeyKeysFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00

ViewKeyMainFragment.java

ui: do show Certify identities button even for secret keys

2014-06-04 21:38:30 +02:00

ViewKeyShareFragment.java

neatness refactoring

2014-06-04 20:27:25 +02:00