aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-312-15/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * Fix animations in create keyDominik Schürmann2014-07-311-0/+2
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-311-0/+14
| |\
| | * completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-311-0/+14
| | | | | | | | | | | | methods
| * | Robots like coffee too...Dominik Schürmann2014-07-311-4/+10
| |/
| * Fix stringDominik Schürmann2014-07-311-1/+1
| |
| * Keyserver exception translateableDominik Schürmann2014-07-311-5/+7
| |
| * Exception handling with keyserver queriesDominik Schürmann2014-07-311-1/+1
| |
| * Better exception handling for import of keysDominik Schürmann2014-07-311-1/+1
| |
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
| |
| * Create key: repeat passphraseDominik Schürmann2014-07-301-2/+3
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-292-1/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-1/+1
| | |
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-261-3/+39
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-0/+1
| | | |
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+1
| | | |
| * | | Use icons in key viewDominik Schürmann2014-07-281-0/+4
| | | |
| * | | Work on first time wizard designDominik Schürmann2014-07-271-0/+5
| | |/ | |/|
| * | test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+1
| | |
| * | canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+2
| | |
| * | Fixed another unescaped apostrophe.Daniel Albert2014-07-171-1/+1
| | |
| * | Fixed unescaped apostropheDaniel Albert2014-07-171-1/+1
| | |
| * | Added description to Setting, Changed title to suggested oneDaniel Albert2014-07-171-1/+2
| | |
| * | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-161-3/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| | * | New first time screenDominik Schürmann2014-07-161-1/+6
| | | |
| | * | merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-0/+1
| | | |
| | * | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-151-0/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * | | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-0/+5
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-0/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| | * | | | get rid of some inspection warningsVincent Breitmoser2014-07-111-1/+1
| | | | | |
| | * | | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+1
| | | | | |
| | * | | | add come createKey stringsVincent Breitmoser2014-07-111-1/+8
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-131-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| | | | |
| * | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-121-0/+1
| |/ / /
| * | | Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| | | |
| * | | Fixed issues discussed in #713Daniel Albert2014-07-121-2/+3
| | | |
| * | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-0/+6
| | |/ | |/|
| * | Work on subkeys adapterDominik Schürmann2014-07-081-0/+5
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| | | | | | | | | | - UI fixes - refactoring
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-7/+20
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * Bett API stringDominik Schürmann2014-07-041-3/+3
| |
| * Use strings in edit keyDominik Schürmann2014-07-031-0/+10
| |
| * Small strings fixDominik Schürmann2014-07-031-1/+1
| |
| * Work on editDominik Schürmann2014-07-031-4/+3
| |
| * Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+4
| |\
| | * support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| | | | | | | | | | | | Closes #695
| | * add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-0/+2
| | |
| * | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+1
| |/ | | | | | | closes #703
* | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| | | | | | | | | | - Multi file - Reworked UI
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 14:22:29 +0000