Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | 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 | 3 | -8/+223 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 3 | -16/+151 | |
| | |\ \ \ \ | ||||||
| | | * | | | | 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 | 3 | -0/+28 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 2 | -12/+12 | |
| * | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 | |
| * | | | | 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 | |
| * | | | 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 | 4 | -52/+246 | |
| |/ | ||||||
* | | 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 | 13 | -106/+75 | |
* | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -744/+0 | |
|/ | ||||||
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -3/+4 | |
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 6 | -801/+780 | |
* | 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 | 3 | -30/+60 | |
* | 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 | 2 | -1/+361 | |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 5 | -48/+66 | |
* | 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 | |
* | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 7 | -104/+339 | |
|\ | ||||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 11 | -378/+269 | |
| |\ | ||||||
| * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 7 | -103/+338 | |
| |\ \ | ||||||
| | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 2 | -4/+113 | |
| | * | | 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 | |
| | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 5 | -60/+116 | |
* | | | | 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 | 3 | -23/+24 | |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 2 | -1/+6 | |
|\| | | ||||||
| * | | 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 | 1 | -1/+5 | |
* | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 10 | -221/+258 |