Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | certs: display cert type in cert view | Vincent Breitmoser | 2014-04-06 | 1 | -0/+5 |
* | Merge remote-tracking branch 'origin/master' into certs | Vincent Breitmoser | 2014-04-05 | 1 | -20/+44 |
|\ | |||||
| * | Change headers in encrypt activity to be more descriptive | Dominik Schürmann | 2014-04-04 | 1 | -2/+2 |
| * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
| * | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 1 | -0/+1 |
| * | Menu cleanup | Dominik Schürmann | 2014-04-01 | 1 | -2/+4 |
| * | language | Dominik Schürmann | 2014-04-01 | 1 | -2/+2 |
| * | Language clarifications | Dominik Schürmann | 2014-04-01 | 1 | -7/+8 |
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 |
| |\ | |||||
| | * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 1 | -0/+1 |
| * | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 1 | -2/+0 |
| |/ | |||||
| * | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 1 | -0/+1 |
| * | merge master | Ashley Hughes | 2014-03-29 | 1 | -5/+54 |
| |\ | |||||
| | * | Text for creation of new api accounts | Dominik Schürmann | 2014-03-26 | 1 | -0/+1 |
| | * | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 1 | -0/+2 |
| | * | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 1 | -0/+4 |
| | * | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -0/+2 |
| | * | | UI-Icon-Modifying #429 added hint to text edit, different icons for share and... | Daniel Hammann | 2014-03-20 | 1 | -0/+3 |
| | |/ | |||||
| | * | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -0/+1 |
| | * | Merge pull request #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 1 | -2/+3 |
| | |\ | |||||
| | | * | #429 4) | Daniel Hammann | 2014-03-17 | 1 | -2/+3 |
| | * | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 1 | -0/+2 |
| | |\ \ | |||||
| | | * | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 1 | -0/+1 |
| | * | | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 1 | -0/+1 |
| | | |/ | | |/| | |||||
| * | | | keep up with master | Ashley Hughes | 2014-03-07 | 1 | -5/+11 |
| |\ \ \ | |||||
| * \ \ \ | master merge | Ashley Hughes | 2014-02-22 | 1 | -26/+37 |
| |\ \ \ \ | |||||
| * | | | | | disable export if unsaved | Ashley Hughes | 2014-02-08 | 1 | -0/+1 |
| * | | | | | ask for save | Ashley Hughes | 2014-02-06 | 1 | -0/+1 |
| * | | | | | slight clarification | Ashley Hughes | 2014-02-04 | 1 | -2/+2 |
| * | | | | | replace spinner with non-functioning checkboxes | Ashley Hughes | 2014-02-02 | 1 | -3/+6 |
* | | | | | | certs: more filters, better initial uid selection, code cosmetics | Vincent Breitmoser | 2014-03-17 | 1 | -0/+3 |
* | | | | | | Merge branch 'certify' into certs | Vincent Breitmoser | 2014-03-15 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-15 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into certs | Vincent Breitmoser | 2014-03-15 | 1 | -2/+4 |
|\| | | | | |||||
| * | | | | Add FAQ tab to help | Dominik Schürmann | 2014-03-13 | 1 | -0/+1 |
| * | | | | Readd create key menu items | Dominik Schürmann | 2014-03-13 | 1 | -0/+1 |
| * | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Removing tab | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | * | | | | Removing unused string | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | * | | | | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
| | * | | | | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 1 | -3/+3 |
* | | | | | | | Merge branch 'master' into certs | Vincent Breitmoser | 2014-03-12 | 1 | -2/+23 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -0/+11 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 1 | -0/+2 |
| * | | | | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 1 | -2/+2 |
| * | | | | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Lint changes | Bhargav Golla | 2014-03-10 | 1 | -2/+2 |
| | |/ / / / / |