aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* certs: display cert type in cert viewVincent Breitmoser2014-04-061-0/+5
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-051-20/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java 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/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * Change headers in encrypt activity to be more descriptiveDominik Schürmann2014-04-041-2/+2
| |
| * Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-1/+1
| |
| * confirm that empty IDs are really wantedAshley Hughes2014-04-021-0/+1
| |
| * Menu cleanupDominik Schürmann2014-04-011-2/+4
| |
| * languageDominik Schürmann2014-04-011-2/+2
| |
| * Language clarificationsDominik Schürmann2014-04-011-7/+8
| |
| * Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-011-0/+1
| |\
| | * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-0/+1
| | |
| * | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-011-2/+0
| |/
| * More experimental work on decrypt fragmentsDominik Schürmann2014-03-301-0/+1
| |
| * merge masterAshley Hughes2014-03-291-5/+54
| |\
| | * Text for creation of new api accountsDominik Schürmann2014-03-261-0/+1
| | |
| | * Part 2 of basic user interface for api accountsDominik Schürmann2014-03-261-0/+2
| | |
| | * More experimental work on api accountsDominik Schürmann2014-03-251-0/+4
| | |
| | * Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-0/+2
| | |\ | | | | | | | | New Fix for #410
| | | * Fix for #410Nikhil Peter Raj2014-03-211-0/+2
| | | |
| | * | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-201-0/+3
| | |/ | | | | | | | | | and clipboard button
| | * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-181-0/+1
| | |
| | * Merge pull request #431 from honnel/ui-modificationDominik Schürmann2014-03-181-2/+3
| | |\ | | | | | | | | Ui modification
| | | * #429 4)Daniel Hammann2014-03-171-2/+3
| | | | | | | | | | | | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server'
| | * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-0/+2
| | |\ \ | | | | | | | | | | Revamp certify dialogue
| | | * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-0/+1
| | | | |
| | * | | Fix export for new unified key list #409uberspot2014-03-151-0/+1
| | | |/ | | |/|
| * | | keep up with masterAshley Hughes2014-03-071-5/+11
| |\ \ \
| * \ \ \ master mergeAshley Hughes2014-02-221-26/+37
| |\ \ \ \
| * | | | | disable export if unsavedAshley Hughes2014-02-081-0/+1
| | | | | |
| * | | | | ask for saveAshley Hughes2014-02-061-0/+1
| | | | | |
| * | | | | slight clarificationAshley Hughes2014-02-041-2/+2
| | | | | |
| * | | | | replace spinner with non-functioning checkboxesAshley Hughes2014-02-021-3/+6
| | | | | |
* | | | | | 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-151-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | 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-121-2/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 16:49:59 +0000