aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-172-17/+17
* certs: green dots for verified status \o/Vincent Breitmoser2014-03-151-1/+11
* certs: provider cleanup and bugfixingVincent Breitmoser2014-03-151-18/+0
* Merge branch 'certify' into certsVincent Breitmoser2014-03-154-8/+137
|\
| * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-151-0/+1
| * certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-0/+88
| * certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-5/+34
| * certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+12
| * certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+11
* | Merge branch 'master' into certsVincent Breitmoser2014-03-1515-229/+289
|\|
| * Fix colors in item viewDominik Schürmann2014-03-132-2/+2
| * remove unused colorDominik Schürmann2014-03-131-1/+0
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-134-55/+78
| * Forgot faq fileDominik Schürmann2014-03-131-0/+12
| * Add FAQ tab to helpDominik Schürmann2014-03-131-0/+1
| * Readd create key menu itemsDominik Schürmann2014-03-132-4/+23
| * XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-16/+10
| |\
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-128-17/+11
| | |\
| | | * 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-1033-278/+949
| | | |\
| | | * | Lint changes after testingBhargav Golla2014-03-108-18/+12
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-1266-173/+931
|\| | | |
| * | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-133/+111
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Add Email suggestions in Create Key activityuberspot2014-03-121-1/+1
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-113-3/+0
| * | | | Add export... button and functionality in multi-selectuberspot2014-03-112-0/+8
| * | | | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-113-92/+0
| | |_|/ | |/| |
| * | | more tight layoutDominik Schürmann2014-03-111-12/+10
| * | | linear layout edited to display test horizontallySreeram Boyapati2014-03-111-1/+4
| * | | Appropriate save Icon in EditKeyActivityuberspot2014-03-117-0/+92
| * | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-103-7/+26
| |\ \ \
| | * | | Added string reference for Issue #207Sreeram Boyapati2014-03-101-0/+2
| | * | | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-102-7/+24
| * | | | Pull from transifexDominik Schürmann2014-03-1023-269/+828
| | |_|/ | |/| |
| * | | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
| * | | Revert "Lint changes"Dominik Schürmann2014-03-1011-16/+23
| * | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1011-23/+16
| |\ \ \
| | * | | Lint changesBhargav Golla2014-03-1011-23/+16
| | |/ /
| * | | 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 bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+6
| | * | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| * | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-092-40/+76
| |/ / /
| * | | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-091-2/+2
| |\ \ \
| | * | | Fix for #347Nikhil Peter Raj2014-03-081-2/+2
| * | | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
| * | | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:08:30 +0000