aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* certs: display cert type in cert viewVincent Breitmoser2014-04-061-0/+5
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-054-21/+61
|\
| * 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
| | |\
| | | * Fix for #410Nikhil Peter Raj2014-03-211-0/+2
| | * | UI-Icon-Modifying #429 added hint to text edit, different icons for share and...Daniel Hammann2014-03-201-0/+3
| | |/
| | * 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
| | |\
| | | * #429 4)Daniel Hammann2014-03-172-3/+4
| | * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-0/+2
| | |\ \
| | | * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-0/+1
| | * | | Lock drawer as open in tabletsuberspot2014-03-161-0/+5
| | * | | Fix export for new unified key list #409uberspot2014-03-151-0/+1
| | | |/ | | |/|
| * | | keep up with masterAshley Hughes2014-03-072-7/+13
| |\ \ \
| * \ \ \ master mergeAshley Hughes2014-02-222-27/+38
| |\ \ \ \
| * | | | | 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
* | | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-0/+4
|\ \ \ \ \ \
| * | | | | | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-151-0/+1
| | |_|_|_|/ | |/| | | |
| * | | | | certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-152-3/+5
|\| | | |
| * | | | 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
| |\ \ \ \
| | * | | | 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
|\| | | | | |
| * | | | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-101-0/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 12:48:24 +0000