| Commit message (Expand) | Author | Age | Files | Lines |
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -277/+0 |
* | Remove import activity from drawer, make it reachable from key list only | Dominik Schürmann | 2014-04-05 | 1 | -1/+1 |
* | Fix nfc, make edit activity like a modal dialog, move all menu actions into v... | Dominik Schürmann | 2014-04-05 | 1 | -9/+21 |
* | db-overhaul: fix key export (and some export-related ui changes) | Vincent Breitmoser | 2014-04-04 | 1 | -5/+6 |
* | db-overhaul: workaround api level 11 | Vincent Breitmoser | 2014-04-04 | 1 | -6/+8 |
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 1 | -9/+22 |
|\ |
|
| * | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ... | Dominik Schürmann | 2014-04-03 | 1 | -11/+3 |
| |\ |
|
| * | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -9/+22 |
* | | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 1 | -0/+2 |
* | | | db-overhaul: minor stuff, mostly ProviderHelper | Vincent Breitmoser | 2014-04-04 | 1 | -1/+3 |
* | | | db-overhaul: more work on new provider | Vincent Breitmoser | 2014-04-03 | 1 | -4/+4 |
* | | | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 1 | -4/+9 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 1 | -1/+0 |
|\| |
|
| * | Rearrange too long lines | Thialfihar | 2014-04-02 | 1 | -1/+2 |
| * | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 1 | -1/+1 |
| * | Adjust import order | Thialfihar | 2014-04-02 | 1 | -1/+0 |
* | | Break a lot of stuff. Also, database redesign. | Vincent Breitmoser | 2014-04-03 | 1 | -9/+2 |
|/ |
|
* | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 1 | -16/+3 |
|\ |
|
| * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -16/+3 |
* | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
|/ |
|
* | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 1 | -2/+5 |
* | final ui code style changes | uberspot | 2014-03-13 | 1 | -1/+1 |
* | More code style fixes for /ui | uberspot | 2014-03-13 | 1 | -1/+2 |
* | First code style changes in ui | uberspot | 2014-03-13 | 1 | -2/+1 |
* | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -2/+9 |
|\ |
|
| * | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 1 | -1/+1 |
| * | Normalize public key uri in KeyListFragment | Vincent Breitmoser | 2014-03-08 | 1 | -1/+8 |
* | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 1 | -2/+1 |
* | | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 1 | -1/+2 |
* | | use parameter in updateFromKeyserver | Dominik Schürmann | 2014-03-08 | 1 | -1/+1 |
* | | removed useless semicolons, fixed some parameters in documenation, simplified... | uberspot | 2014-03-07 | 1 | -2/+2 |
|/ |
|
* | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 1 | -287/+45 |
* | language fixes | Dominik Schürmann | 2014-02-08 | 1 | -1/+3 |
* | do not delete pub keys where secret key exists | Dominik Schürmann | 2014-02-06 | 1 | -12/+24 |
* | keyserver instead of key server | Dominik Schürmann | 2014-02-05 | 1 | -1/+1 |
* | work on lookup key, fix some illegal state exceptions with hack | Dominik Schürmann | 2014-02-04 | 1 | -2/+4 |
* | Certify not sign a key, added as button, does not belong to menu | Dominik Schürmann | 2014-02-04 | 1 | -18/+27 |
* | expose key server API | Dominik Schürmann | 2014-02-02 | 1 | -1/+1 |
* | Switch from ActionBarSherlock to ActionBarCompat | Dominik Schürmann | 2014-02-02 | 1 | -5/+5 |
* | Fix QR Code URI | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
* | Reworking import, testing needed... | Dominik Schürmann | 2014-02-01 | 1 | -3/+3 |
* | rename KeyServerUploadActivity to UploadKeyActivity | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
* | Started working on integration of keyserver query into import activity | Dominik Schürmann | 2014-02-01 | 1 | -2/+2 |
* | No bouncy castle objects in key view | Dominik Schürmann | 2014-02-01 | 1 | -26/+15 |
* | Fix and simplify user id parsing | Dominik Schürmann | 2014-01-31 | 1 | -1/+1 |
* | language fix | Dominik Schürmann | 2014-01-29 | 1 | -3/+2 |
* | show unknown in ViewKey if user id is not set | Dominik Schürmann | 2014-01-29 | 1 | -2/+7 |
* | Give expiry dates to PgpKeyOperation | Dominik Schürmann | 2014-01-29 | 1 | -3/+3 |
* | Use intent data instead of IDs for upload and sign, fixes #205 | Dominik Schürmann | 2014-01-29 | 1 | -16/+2 |
* | save keyring in-place, fixes #228, #203 | Dominik Schürmann | 2014-01-29 | 1 | -155/+160 |