aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* minor ui and wording changesVincent Breitmoser2015-04-091-4/+4
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-25/+13
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-0/+1
| | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
| * 3.2beta3Dominik Schürmann2015-03-231-1/+1
| |
| * translation fixesDominik Schürmann2015-03-231-20/+0
| |
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-231-4/+9
| |
| * introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+2
| | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | even more linked id ui workVincent Breitmoser2015-03-291-0/+1
| |
* | more (subtle) ui workVincent Breitmoser2015-03-261-8/+8
| |
* | some linked id ui fine tuningVincent Breitmoser2015-03-261-1/+9
| |
* | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
| |
* | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-4/+8
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Manage my keys wizardDominik Schürmann2015-03-191-3/+5
| |
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-161-0/+1
| |
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-161-1/+2
| |
* | support github resource (re)Vincent Breitmoser2015-03-241-1/+10
| |
* | support github resource (pa)Vincent Breitmoser2015-03-241-0/+3
| |
* | work on certification uiVincent Breitmoser2015-03-151-6/+10
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-5/+8
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
| |
| * Updated fix for Issue #1116Manoj Khanna2015-03-111-3/+4
| |
| * Pull from transifexDominik Schürmann2015-03-101-1/+1
| |
| * API 7Dominik Schürmann2015-03-101-1/+2
| |
* | work on second step of identity creationVincent Breitmoser2015-03-131-14/+15
| |
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-20/+18
| |
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| |
* | change finish button label to "link identity"Vincent Breitmoser2015-03-131-0/+1
| |
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-102-5/+7
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * RippleDominik Schürmann2015-03-101-4/+0
| |
| * Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+1
| | |
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-101-2/+4
| | |
| | * added contact linkingAdithya Abraham Philip2015-03-101-0/+2
| | |
| | * added cardAdithya Abraham Philip2015-03-101-0/+1
| | |
| * | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+4
| | |
* | | add expand item to linked id listVincent Breitmoser2015-03-101-0/+4
| | |
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-12/+17
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+1
| | |
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-091-2/+4
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-2/+2
| |
| * Improve iconsDominik Schürmann2015-03-091-7/+7
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-091-2/+5
| |\ | | | | | | | | | development
| * | Tryout design for encrypt, decryptDominik Schürmann2015-03-061-2/+4
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-082-3/+23
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
| |/
| * Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-051-0/+14
| |\ | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| | * Implemented Matt Allen password strength indicatorLukas Zorich2015-03-031-0/+14
| | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
| * | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
| | |
| * | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-051-0/+1
| | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists