aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+5
|
* Refactor expiry dialogDominik Schürmann2014-08-051-1/+1
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
|
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-75/+0
|
* Even more smaller nitpicksDominik Schürmann2014-08-041-0/+1
|
* button language in encryptDominik Schürmann2014-08-041-2/+1
|
* Smaller UI fixesDominik Schürmann2014-08-041-2/+3
|
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-2/+10
|\ | | | | Improve file encrypt
| * Minor cleanupmar-v-in2014-08-021-0/+1
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| |\
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-18/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * | | Fix string resourcesmar-v-in2014-07-311-4/+5
| | | |
| * | | 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
| * | | | - 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
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-021-0/+2
| | | | | |
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-12/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-221-8/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| * | | | | | | Improve file more, Part 1mar-v-in2014-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* | | | | | | | Add user id with dialogDominik Schürmann2014-08-011-3/+3
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Certifying instead of signingDominik Schürmann2014-08-011-0/+1
| | | | | |
* | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-311-2/+2
| | | | | |
* | | | | | Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
| | | | | |
* | | | | | Fixes for uploadDominik Schürmann2014-07-311-0/+1
| | | | | |
* | | | | | Create key: design fixesDominik Schürmann2014-07-311-7/+9
| |_|_|_|/ |/| | | |
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:38:03 +0000