Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
| | * | | 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 | |
| | | | | | | | | | | | | closes #703 | |||||
* | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 10 | -221/+258 | |
| | | | ||||||
* | | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 4 | -327/+180 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 15 | -68/+52 | |
|\ \ | ||||||
| * | | Fixed Bootstrap resource | Daniel Albert | 2014-06-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | 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 | 21 | -299/+1109 | |
| |\| | ||||||
| * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 5 | -30/+20 | |
| | | | ||||||
| * | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 4 | -13/+12 | |
| | | | | | | | | | | | | Added drawables for them | |||||
| * | | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 1 | -4/+3 | |
| | | | ||||||
| * | | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 2 | -9/+6 | |
| | | | | | | | | | | | | select_secret_key_layout to use it | |||||
| * | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 2 | -7/+6 | |
| | | | ||||||
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 1 | -3/+3 | |
| | | | | | | | | | | | | converted decrypt_file_fragment to new style | |||||
* | | | work on edit key | Dominik Schürmann | 2014-06-30 | 4 | -34/+82 | |
| |/ |/| | ||||||
* | | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 4 | -83/+119 | |
| | | ||||||
* | | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 3 | -3/+20 | |
| | | ||||||
* | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 8 | -144/+117 | |
| | | | | | | | | closes #698 | |||||
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 11 | -71/+855 | |
|\ \ | |/ |/| | ||||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 3 | -4/+145 | |
| | | ||||||
| * | More wizardry | Dominik Schürmann | 2014-06-27 | 3 | -89/+159 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-27 | 6 | -91/+217 | |
| |\ | ||||||
| * | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 2 | -4/+399 | |
| | | | ||||||
| * | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 5 | -58/+236 | |
| | | | ||||||
* | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 1 | -11/+15 | |
| |/ |/| | ||||||
* | | Merge pull request #690 from mar-v-in/hkps-by-default | Dominik Schürmann | 2014-06-25 | 5 | -90/+212 | |
|\ \ | | | | | | | HKPS by default | |||||
| * | | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 4 | -41/+53 | |
| | | | ||||||
| * | | Merge branch 'master' into hkps-by-default | mar-v-in | 2014-06-24 | 11 | -54/+475 | |
| |\ \ | ||||||
| * | | | Fix sks-keyservers.net sub pool | mar-v-in | 2014-06-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update Keyservers to use hkps as needed | mar-v-in | 2014-06-24 | 3 | -2/+25 | |
| | | | | ||||||
| * | | | Use URLEncoder instead of Uri.encode | mar-v-in | 2014-06-24 | 1 | -2/+6 | |
| | | | | ||||||
| * | | | Rewrote hkp add to work with hkps as well. | mar-v-in | 2014-06-24 | 1 | -24/+13 | |
| | | | | | | | | | | | | | | | | Also removes HttpClient dependency (deprecated for android) | |||||
| * | | | Few fixes on hkps | mar-v-in | 2014-06-23 | 2 | -35/+34 | |
| | | | | | | | | | | | | | | | | TODO: Fix add as well | |||||
| * | | | Add hkps support for sks-keyservers.net | mar-v-in | 2014-06-23 | 2 | -65/+77 | |
| | | | | ||||||
| * | | | Add TlsHelper (designed to be used with sks-keyservers.net) | mar-v-in | 2014-06-23 | 1 | -0/+83 | |
| | | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA | |||||
* | | | | Merge pull request #688 from da-kid/master | Dominik Schürmann | 2014-06-24 | 1 | -1/+5 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix for #687 | |||||
| * | | | Fix for #687 | Daniel Albert | 2014-06-24 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | Merge submodules | Dominik Schürmann | 2014-06-24 | 2 | -6/+25 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | borrow tests from Haskell OpenPGP | Art O Cathain | 2014-06-23 | 2 | -6/+25 | |
| | | | | ||||||
* | | | | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 2 | -15/+18 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | Use minidns instead of dnsjava |