aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-171-0/+3
| | | | | | | - add three types of filters for certificate list (ui looks like crap there, need to work on that) - select uncertified uids by default in CertifyKeyActivity - move some code around in KeychainProvider, 's slightly less hacky now
* Merge branch 'certify' into certsVincent Breitmoser2014-03-151-0/+4
|\ | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/values/strings.xml
| * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-151-0/+1
| |
| * certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-0/+1
| | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled.
* | Merge branch 'master' into certsVincent Breitmoser2014-03-152-3/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * remove unused colorDominik Schürmann2014-03-131-1/+0
| |
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-131-1/+2
| |
| * Add FAQ tab to helpDominik Schürmann2014-03-131-0/+1
| |
| * Readd create key menu itemsDominik Schürmann2014-03-131-0/+1
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-131-2/+2
| |\ | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * Removing tabBhargav Golla2014-03-101-1/+1
| | |
| | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | |
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-101-0/+2
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-101-3/+3
| | | |
* | | | Merge branch 'master' into certsVincent Breitmoser2014-03-122-4/+25
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+11
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-101-0/+2
| |\ \ \ | | |_|/ | |/| | Fix to passphrase dialog and Issue #207
| | * | Added string reference for Issue #207Sreeram Boyapati2014-03-101-0/+2
| | | |
| * | | Revert "Lint changes"Dominik Schürmann2014-03-101-2/+2
| | | | | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
| * | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-101-2/+2
| |\ \ \ | | | | | | | | | | Lint changes #223
| | * | | Lint changesBhargav Golla2014-03-101-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
| * | | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| | | |
| * | | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-091-0/+5
| |\ \ \ | | | | | | | | | | progress is shown when creating the default key based on number of keys created till then
| | * | | progress bar while key creation - added plurals based on no.of keys while ↵grait2014-03-091-1/+6
| | | | | | | | | | | | | | | | | | | | key creation
| | * | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| | | | |
| * | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-091-0/+2
| |/ / /
| * | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+6
| |\ \ \ | | |/ / | |/| | Show error if file import has no content
| | * | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-0/+5
| | | |
| | * | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+1
| | | |
| * | | move hardcode strings to strings.xmluberspot2014-03-071-0/+3
| | | |
| * | | Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+2
| | | |
| * | | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-062-3/+3
| |\ \ \ | | | | | | | | | | #338
| | * | | corrected commitAnkush2014-03-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
| * | | | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-061-0/+1
| |/ / /
| * | | Use string from strings.xmlMiroojin Bakshi2014-03-061-0/+1
| | | |
* | | | add empty view to viewkeycertsfragmentVincent Breitmoser2014-03-121-0/+1
| | | |
* | | | add view cert activityVincent Breitmoser2014-03-121-0/+9
| | | |
* | | | add "show unknown signatures" buttonVincent Breitmoser2014-03-111-0/+1
| |_|/ |/| |
* | | add contact count to My Keys headerVincent Breitmoser2014-03-081-0/+5
| | |
* | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-0/+4
| | |
* | | move some placeholders into resourcesVincent Breitmoser2014-03-081-0/+2
|/ /
* | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-041-0/+1
|\ \ | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
| * | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵Jessica Yuen2014-03-021-0/+1
| |/ | | | | | | cancelable.
* / change ordering in Intent descriptions for better readability in small dialogsDominik Schürmann2014-03-031-4/+4
|/
* Added error strings for key import from keyserverDaniel Haß2014-02-271-0/+3
|
* rename to OpenKeychainDominik Schürmann2014-02-212-8/+8
|
* add integrity checkDominik Schürmann2014-02-181-0/+1
|
* merge internal signText and signAndEncrypt methodsDominik Schürmann2014-02-181-1/+1
|
* warn that key generation takes looongDominik Schürmann2014-02-151-1/+1
|
* parse string util method, better help text for access screenDominik Schürmann2014-02-151-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 08:22:04 +0000