aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-1/+7
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-131-0/+4
| |
| * remove unused NfcActivityVincent Breitmoser2015-03-301-6/+0
| |
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-2/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-0/+2
| | |
| * | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-7/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | | generalize nfc crypto input structureVincent Breitmoser2015-03-181-0/+6
| | | |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-2/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | 3.2beta3Dominik Schürmann2015-03-231-2/+2
| | | |
| * | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-231-0/+3
| | |/ | |/| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-20/+15
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | Manage my keys wizardDominik Schürmann2015-03-191-7/+1
| |/
| * Manifest cleanupDominik Schürmann2015-03-171-9/+12
| |
| * Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-2/+9
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * links own keys to me profile in contactsAdithya Abraham Philip2015-03-131-0/+1
| |
| * Version 3.2beta2Dominik Schürmann2015-03-101-2/+2
| |
| * API 7Dominik Schürmann2015-03-101-0/+6
| |
* | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-1/+1
|\|
| * Make create key wizard step-by-stepDominik Schürmann2015-03-091-1/+1
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-2/+0
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Update patternview lib, remove workaroundDominik Schürmann2015-03-031-2/+0
| |
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-59/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-271-1/+1
| |
| * Better qr code resizingDominik Schürmann2015-02-271-1/+1
| |
| * go to directly to certify screen after nfc importVincent Breitmoser2015-02-271-9/+9
| |
| * Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-0/+8
| |
| * New advanced key viewDominik Schürmann2015-02-231-2/+2
| |
| * Remove old pattern lib, add new pattern libDominik Schürmann2015-02-231-6/+2
| |
| * Fix back button in encrypt activitiesDominik Schürmann2015-02-221-6/+12
| |
| * Saving of allowed keysDominik Schürmann2015-01-291-5/+0
| |
| * Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-291-28/+13
| |
| * Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+6
| | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * Toolbar for settingsDominik Schürmann2015-01-141-2/+2
| |
| * Set minSdk to 14Dominik Schürmann2015-01-131-4/+1
| |
* | affirmation -> linked identityVincent Breitmoser2015-01-151-2/+2
| |
* | intermediate state, nothing really working yetVincent Breitmoser2015-01-121-0/+4
|/
* Passphrase wizard testsDominik Schürmann2015-01-061-0/+2
|
* New work on PIN and lock pattern UIDominik Schürmann2014-12-291-0/+6
|
* Set version to 3.2beta1Dominik Schürmann2014-12-041-3/+3
|
* Version 3.1.2Dominik Schürmann2014-11-021-2/+2
|
* Version 3.1.1Dominik Schürmann2014-10-301-2/+2
|
* Revert "Version 3.1.1"Dominik Schürmann2014-10-301-2/+2
| | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167.
* Version 3.1.1Dominik Schürmann2014-10-301-2/+2
|
* Version 3.1Dominik Schürmann2014-10-261-2/+2
|
* Rename multi certify files to certifyDominik Schürmann2014-10-261-1/+1
|
* 3.1beta1Dominik Schürmann2014-10-261-2/+2
|
* Fix decrypt intent apiDominik Schürmann2014-10-261-1/+1
|
* Hide keyboard in safe slinger activityDominik Schürmann2014-10-261-0/+1
|
* Move advanced info into own activityDominik Schürmann2014-10-261-0/+5
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 18:39:43 +0000