aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* | | Start new designed activityDominik Schürmann2014-06-219-8/+404
| |/ |/|
* | 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-208-41/+203
|\
| * revert to previous min versionArt O Cathain2014-06-191-1/+1
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| * Start on Robolectric integration testArt O Cathain2014-06-168-42/+201
* | 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
| | * | canonicalize: missed two logging entriesVincent Breitmoser2014-06-183-4/+8
| * | | consistent button design in import activityDominik Schürmann2014-06-182-18/+0
| |/ /
* | | Merge branch 'master' into improve-filemar-v-in2014-06-1875-2062/+3204
|\| |
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-183-57/+201
| |\ \
| | * \ Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-182-53/+198
| | |\ \
| | | * | Reset importDone at the beginning of syncmar-v-in2014-06-181-0/+1
| | | * | Wait for import to be done before writing contactsmar-v-in2014-06-181-2/+19
| | | * | Remove abandoned contactsmar-v-in2014-06-181-26/+90
| | | * | Code stylemar-v-in2014-06-181-13/+26
| | | * | Continue contact db syncmar-v-in2014-06-181-39/+89
| * | | | Merge branch 'new-edit'Vincent Breitmoser2014-06-189-991/+315
| |\ \ \ \
| | * | | | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-174-72/+158
| | * | | | new-edit: add new save keyring stuffVincent Breitmoser2014-06-173-151/+124
| | * | | | new-edit: remove old save keyring stuffVincent Breitmoser2014-06-176-819/+83
| * | | | | generate public keyring from secret if not availableVincent Breitmoser2014-06-184-21/+39
| | |/ / / | |/| | |
| * | | | consolidate: almost sane loggingVincent Breitmoser2014-06-184-49/+63
| * | | | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-187-53/+198
| * | | | consolidate: make it workVincent Breitmoser2014-06-184-105/+126
| * | | | code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-182-36/+22
| * | | | consolidate: add loggingVincent Breitmoser2014-06-185-8/+61
| * | | | consolidate: first draftVincent Breitmoser2014-06-182-4/+115
| * | | | import-log: don't count self certs as unknownVincent Breitmoser2014-06-181-0/+1
| * | | | prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-182-75/+87
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-187-109/+265
| |\ \ \ \
| | * | | | handle database error on secret key insertVincent Breitmoser2014-06-173-1/+6