| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | * | | | | | actually canonicalize | Art O Cathain | 2014-07-06 | 2 | -5/+11 | |
| | | | | | | | | | ||||||
| | | | * | | | | | work in progress | Art O Cathain | 2014-07-06 | 4 | -1/+548 | |
| | | |/ / / / / | |/| | | | | | ||||||
| | | * | | | | | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 14 | -16/+148 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling. | |||||
| | | * | | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 2 | -2/+19 | |
| | | | | | | | | ||||||
| | | * | | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 5 | -1/+564 | |
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+11 | |
| | | | | | | | | ||||||
| | | * | | | | | work in progress | Art O Cathain | 2014-07-06 | 4 | -1/+548 | |
| | |/ / / / / |/| | | | | | ||||||
| | * | | | | | Merge pull request #708 from artbristol/composition-not-inheritance | Vincent | 2014-07-06 | 2 | -6/+27 | |
| |/| | | | | | | | | | | | | | | | | | Prefer composition to inheritance | |||||
| | * | | | | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 2 | -6/+27 | |
| |/ / / / / | ||||||
| * | | | | | 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 | |
| | | | | | | ||||||
| * | | | | | Update spongycastle | Dominik Schürmann | 2014-07-02 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 9 | -105/+343 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 19 | -461/+8499 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 10 | -104/+342 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 3 | -4/+115 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #695 | |||||
| | | * | | | | | | use expert create key for key creation testing (revert this later on!) | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 | |
| | | | | | | | | | ||||||
| | | * | | | | | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 2 | -37/+62 | |
| | | | | | | | | | ||||||
| | | * | | | | | | update spongycastle to include addSubkeyBindingCertification | Vincent Breitmoser | 2014-07-02 | 1 | -0/+0 | |
| | | | | | | | | | ||||||
| | | * | | | | | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 7 | -61/+118 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix nullpointer, cleanup | Dominik Schürmann | 2014-07-02 | 3 | -10/+9 | |
| | | | | | | | | | ||||||
| * | | | | | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 4 | -88/+53 | |
| | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 4 | -31/+24 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 3 | -2/+7 | |
| |\| | | | | | | ||||||
| | * | | | | | | forgot a line in previous commit | Vincent Breitmoser | 2014-07-02 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 2 | -2/+6 | |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | closes #703 | |||||
| * | | | | | | Add infographic from FSFE | Dominik Schürmann | 2014-07-02 | 3 | -0/+8158 | |
| | | | | | | | ||||||
| * | | | | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 14 | -236/+330 | |
| | | | | | | | ||||||
| * | | | | | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 5 | -387/+180 | |
| |/ / / / / | ||||||
| * | | | | | remove leftover of AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | Removed submodule AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 2 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 59 | -160/+268 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge pull request #704 from da-kid/master | Dominik Schürmann | 2014-06-30 | 59 | -160/+268 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Fixed #702 and also #597 | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |