aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Rename adapterDominik Schürmann2014-06-226-29/+39
|
* add buttons in edit keyDominik Schürmann2014-06-221-0/+64
|
* 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 keyring
| * 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 submodule
| * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-203-223/+30
| | |
* | | 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-207-12/+181
|\ | | | | Start on Robolectric integration test
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| |
| * Start on Robolectric integration testArt O Cathain2014-06-167-12/+178
| |
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵mar-v-in2014-06-1937-428/+206
|\ \ | | | | | | | | | improve-file
| * | 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 ↵Dominik Schürmann2014-06-1816-3/+3
| | | | | | | | | | | | naming conventions
| * | 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-1874-2056/+3195
|\| |
| * | 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
| | |\ \ | | | | | | | | | | Improve contact sync
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db
| * | | | Merge branch 'new-edit'Vincent Breitmoser2014-06-189-991/+315
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| | * | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 19:16:26 +0000