Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -0/+1 |
* | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -7/+9 |
* | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 1 | -0/+2 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 1 | -0/+14 |
|\ | |||||
| * | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 1 | -0/+14 |
* | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+10 |
|/ | |||||
* | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
* | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -5/+7 |
* | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
* | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
* | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 1 | -2/+3 |
* | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 2 | -1/+3 |
|\ | |||||
| * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -1/+1 |
| * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -3/+39 |
| |\ | |||||
| * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -0/+1 |
| * | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -0/+1 |
* | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 1 | -0/+4 |
* | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 1 | -0/+5 |
| |/ |/| | |||||
* | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
* | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |
* | | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
* | | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 |
* | | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 1 | -1/+2 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 1 | -3/+22 |
|\ \ | |||||
| * | | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -1/+6 |
| * | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -0/+7 |
| |\ \ | |||||
| * | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
| * | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -0/+5 |
| |\ \ \ | |||||
| * | | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| * | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| * | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 |
* | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+1 |
|/ / / | |||||
* | | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
* | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+3 |
* | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -0/+6 |
| |/ |/| | |||||
* | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -0/+5 |
|/ | |||||
* | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 |
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -0/+10 |
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -4/+3 |
* | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+4 |
|\ | |||||
| * | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| * | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -0/+2 |
* | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+1 |
|/ | |||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -10/+23 |
* | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 1 | -0/+1 |