Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 3 | -18/+67 | |
| | | | | | ||||||
| * | | | | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | | | | ||||||
| * | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 3 | -3/+19 | |
| | | | | | ||||||
| * | | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| | * | | | | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 6 | -7/+100 | |
| | | | | | | ||||||
| | * | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java | |||||
| | * | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | | | ||||||
| | * | | | | Actually test canonicalize | Art O Cathain | 2014-07-06 | 2 | -75/+160 | |
| | | | | | | ||||||
| | * | | | | data fixes | Art O Cathain | 2014-07-06 | 1 | -13/+14 | |
| | | | | | | ||||||
| | * | | | | 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 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |||||
| | * | | | | 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 | |
| | | | | | | | | | Naming conventions save lives... or atleast make addAll() work | |||||
* | | | 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 | |
|/ | ||||||
* | 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 | |
| |