| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | | * | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| | | * | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 |
| | | * | | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 |
| | * | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 |
| | * | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 |
| | * | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 4 | -1/+530 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| | | * | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 |
| | | * | | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 |
| * | | | | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 4 | -10/+225 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 |
| | * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 4 | -16/+158 |
| | |\ \ \ \ |
|
| | | * | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | * | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 |
| | | |_|_|/
| | |/| | | |
|
| * | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 5 | -0/+34 |
| | |/ / /
| |/| | | |
|
| * | | | | 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 | 3 | -14/+15 |
| * | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 2 | -6/+12 |
| * | | | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 |
| * | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 3 | -7/+83 |
| * | | | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 |
| |/ / / |
|
| * | | | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
| * | | | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 |
| * | | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 |
| |\| | |
|
| | * | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 2 | -6/+27 |
| | |/ |
|
| * / | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 8 | -66/+310 |
| |/ |
|
* | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 |
* | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 17 | -112/+82 |
* | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 2 | -744/+1 |
|/ |
|
* | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 |
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 3 | -7/+18 |
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 3 | -7/+30 |
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 25 | -352/+1289 |
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 8 | -819/+782 |
* | cleanup, debug for passphrase set | Dominik Schürmann | 2014-07-03 | 1 | -5/+4 |
* | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 |
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -2/+2 |
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 5 | -37/+152 |
* | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 |
* | cleanup | Dominik Schürmann | 2014-07-03 | 2 | -0/+5 |
* | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 4 | -2/+458 |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 8 | -60/+69 |
* | smaller dropdown items | Dominik Schürmann | 2014-07-03 | 2 | -4/+4 |
* | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 2 | -2/+2 |
* | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 |
* | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 8 | -104/+343 |
|\ |
|
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 16 | -461/+341 |
| |\ |
|