| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 19 | -461/+8499 |
| |\ | |||||
| | * | 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 |
| | |\ | |||||
| | * | | 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 |
| * | | | 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 |
| | * | | 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 |
| * | | | 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 |
| | |/ |/| | |||||
| * | | 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 Bootstrap resource | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| | | * | (should have) fixed Travis builds | Daniel Albert | 2014-06-30 | 2 | -7/+2 |
| | | * | Deprecated Android Bootstrap, thus fixing #597 | Daniel Albert | 2014-06-30 | 2 | -2/+0 |
| | | * | Fixed, issue #702 | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| | | * | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 36 | -314/+1466 |
| | | |\ | | |/ | |/| | |||||
| | | * | Converted all other buttons | Daniel Albert | 2014-06-30 | 23 | -60/+48 |
| | | * | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 17 | -37/+102 |
| | | * | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 2 | -9/+6 |
| | | * | Added new button style and converted account_settings and the select_secret_k... | Daniel Albert | 2014-06-29 | 9 | -19/+51 |
| | | * | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 3 | -13/+9 |
| | | * | Improved button style | Daniel Albert | 2014-06-29 | 3 | -21/+12 |
| | | * | Added button_rounded style | Daniel Albert | 2014-06-28 | 3 | -6/+52 |
| * | | | work on edit key | Dominik Schürmann | 2014-06-30 | 7 | -40/+84 |
| |/ / | |||||
| * | | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 5 | -83/+125 |
| * | | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 3 | -3/+20 |
| * | | travis: update sdk | Dominik Schürmann | 2014-06-28 | 1 | -2/+2 |
| * | | Update keybase lib | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| * | | Try new travis hack | Dominik Schürmann | 2014-06-28 | 1 | -1/+2 |
| * | | Fix supertoast submodule | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| * | | Update git submodules for android gradle plugin to 0.12.0 | Dominik Schürmann | 2014-06-28 | 3 | -0/+0 |
| * | | Update android gradle plugin to 0.12.0 | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| * | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 9 | -154/+140 |
| * | | Update subnodule keybase to fixed version of support libs | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-28 | 10 | -18/+20 |
| |\ \ | |||||
| | * \ | Merge pull request #699 from da-kid/master | Dominik Schürmann | 2014-06-28 | 10 | -18/+20 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 19 | -71/+1177 |
| | | |\ \ | | |/ / | |/| / | | |/ | |||||
| | | * | Switched to the dark icons | Daniel Albert | 2014-06-28 | 4 | -0/+0 |
| | | * | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 6 | -14/+20 |
| | | * | Swapped out FontawesomeText with normal ImageView | Daniel Albert | 2014-06-26 | 1 | -10/+6 |
| * | | | Change keybase submodule to our fork | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| |/ / | |||||
| * | | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 5 | -5/+147 |
| * | | More wizardry | Dominik Schürmann | 2014-06-27 | 5 | -104/+202 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |