aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Switch to dnsjavamar-v-in2014-06-232-15/+18
| * | | | Merge pull request #684 from da-kid/masterDominik Schürmann2014-06-231-0/+6
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-232-63/+110
| | |\ \
| | * | | Fixed Issue #683 which caused OK to crash upon importing keys which contain p...Daniel Albert2014-06-231-0/+6
| * | | | remove margin in import keys (leftover from nav drawer)Dominik Schürmann2014-06-231-2/+0
| | |/ / | |/| |
| * | | Merge pull request #681 from timbray/masterDominik Schürmann2014-06-231-0/+3
| |\ \ \
| | * | | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| | |/ /
| * / / new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
| |/ /
| * | new edit key: diff for existing user idsDominik Schürmann2014-06-228-36/+405
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-227-131/+93
| |\|
| * | Rename adapterDominik Schürmann2014-06-226-29/+39
| * | add buttons in edit keyDominik Schürmann2014-06-221-0/+64
* | | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2242-495/+982
|\ \ \ | | |/ | |/|
| * | ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
| * | use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
| * | fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-2219-284/+577
| |\|
| | * Revert hint_keybase_searchDominik Schürmann2014-06-221-1/+1
| | * Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-218-52/+147
| | |\
| | | * VERY basic test for save keyringArt O Cathain2014-06-218-52/+147
| | * | Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| | * | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-213-223/+30
| | |\ \
| | | * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-203-223/+30
| | * | | Start new designed activityDominik Schürmann2014-06-219-8/+404
| | | |/ | | |/|
| * | | fix parcel method in ParcelableKeyRingVincent Breitmoser2014-06-221-1/+3
| * | | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-223-2/+12
| |/ /
| * | Fix qr code finallyDominik Schürmann2014-06-204-19/+31
| * | import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
| * | Work on Qr code importDominik Schürmann2014-06-205-43/+70
| |/
| * Fix keybase importDominik Schürmann2014-06-203-2/+5
| * Use actionbar button for log activityDominik Schürmann2014-06-203-34/+48
| * Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-202-14/+7
| * Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
| * Merge pull request #658 from artbristol/functional-testingVincent2014-06-207-12/+181
| |\
| | * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| | * Start on Robolectric integration testArt O Cathain2014-06-167-12/+178
* | | Improve file more, Part 1mar-v-in2014-06-2215-496/+291
|/ /
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...mar-v-in2014-06-1937-428/+206
|\ \
| * | Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
| * | Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| * | Remove unused code to import splitted qr codesDominik Schürmann2014-06-192-96/+1
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-193-124/+3
| |\ \
| | * | remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
| * | | New callback model for ImportKeysActivityDominik Schürmann2014-06-197-108/+95
| |/ /
| * | Reference ic_launcher instead of iconDominik Schürmann2014-06-184-4/+4
| * | decrease size of search icons in importDominik Schürmann2014-06-182-2/+2
| * | forward touch events to pager in import activityVincent Breitmoser2014-06-181-0/+13
| * | Fix new actionbar icon sizes, rename icon to ic_launcher following Android na...Dominik Schürmann2014-06-1816-3/+3
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-184-5/+9
| |\ \
| | * | fix key exportVincent Breitmoser2014-06-181-1/+1