aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Rework menu itemsDominik Schürmann2014-04-051-3/+1
|
* 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-295-7/+72
|\
| * 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
| |
| * Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-211-0/+11
| |
| * 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-182-3/+4
| |\ | | | | | | Ui modification
| | * #429 4)Daniel Hammann2014-03-172-3/+4
| | | | | | | | | | | | | | | 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
| | | |
| | * | 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.
| * | Lock drawer as open in tabletsuberspot2014-03-161-0/+5
| | |
| * | Fix export for new unified key list #409uberspot2014-03-151-0/+1
| |/
| * 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 '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
| | * | 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 #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
| |/ / /