aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-113-0/+12
| | | |
| * | | fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| | | |
| * | | modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| | | |
| * | | some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-113-18/+67
| | | |
| * | | modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| | | |
| * | | add come createKey stringsVincent Breitmoser2014-07-113-3/+19
| | | |
| * | | tests: add testSubkeyAddVincent Breitmoser2014-07-102-0/+5
| | | |
| * | | Merge remote-tracking branch ↵Vincent Breitmoser2014-07-098-830/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
| | * | | actually provide a tostringArt O Cathain2014-07-071-1/+1
| | | | |
| | * | | prevent odd ambiguous method toString errorArt O Cathain2014-07-071-1/+1
| | | | |
| | * | | (c) headers, tidy importsArt O Cathain2014-07-076-7/+100
| | | | |
| | * | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
| | * | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | | |
| | * | | Actually test canonicalizeArt O Cathain2014-07-062-75/+160
| | | | |
| | * | | data fixesArt O Cathain2014-07-061-13/+14
| | | | |
| | * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | | | |
| | * | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | | | |
| | * | | work in progressArt O Cathain2014-07-063-1/+511
| | | | |
| * | | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| | | | |
| * | | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | | |
| * | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-074-1/+530
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
| | * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | | | |
| | * | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | | | |
| | * | | work in progressArt O Cathain2014-07-063-1/+511
| | | | |
* | | | | Final Commit for #662Daniel Albert2014-07-161-1/+6
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-134-10/+225
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| | | | |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-124-16/+158
| |\ \ \ \
| | * | | | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | | | | |
| * | | | | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | |_|_|/ | |/| | |
* | | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-125-0/+34
| |/ / / |/| | |
* | | | Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| | | |
* | | | Fixed issues discussed in #713Daniel Albert2014-07-123-14/+15
| | | |
* | | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-122-6/+12
| | | |
* | | | Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
| | | |
* | | | Implemented Notification, no fallback yetDaniel Albert2014-07-123-7/+83
| | | |
* | | | new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
|/ / /
* | | Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| | | | | | | | | Naming conventions save lives... or atleast make addAll() work
* | | Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
| | |
* | | cleanupDominik Schürmann2014-07-081-30/+0
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
|\| |
| * | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
| |/
* / Work on subkeys adapterDominik Schürmann2014-07-088-66/+310
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
|
* Use strings in edit keyDominik Schürmann2014-07-033-7/+18
|
* Pull from transifexDominik Schürmann2014-07-033-7/+30
|
* Pull from transifexDominik Schürmann2014-07-0325-352/+1289
|
* Small strings fixDominik Schürmann2014-07-031-1/+1
|
* Remove old edit button, rename activitiesDominik Schürmann2014-07-038-819/+782
|
* cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 19:24:22 +0000