aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| * | canonicalize: support secret keysVincent Breitmoser2014-06-174-14/+36
| * | import-log: clean up progress messagesVincent Breitmoser2014-06-172-7/+6
| * | canonicalize: fix NullPointerExceptionVincent Breitmoser2014-06-171-1/+2
| * | drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-164-5/+23
| * | add more progress info from import routineVincent Breitmoser2014-06-163-3/+43
| * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more...Vincent Breitmoser2014-06-164-79/+150
* | | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1834-460/+1204
|/ /
* | Merge pull request #656 from danielhass/supertoast-devDominik Schürmann2014-06-164-1/+87
|\ \
| * | Changed license headerDaniel Haß2014-06-161-11/+11
| * | Moved Notify class to utilsDaniel Haß2014-06-162-2/+2
| * | Removed unused importDaniel Haß2014-06-161-1/+0
| * | Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
| * | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| * | Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
| * | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
|/ /
* | Merge pull request #654 from artbristol/masterDominik Schürmann2014-06-141-1/+1
|\ \
| * | Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Desc...Art O Cathain2014-06-141-1/+1
|/ /
* | Merge branch 'canonicalize'Vincent Breitmoser2014-06-1372-483/+2583
|\ \
| * \ Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1343-163/+823
| |\ \
| | * | Update example code instructionsDominik Schürmann2014-06-091-2/+2
| | * | Update README for build toolsDominik Schürmann2014-06-091-1/+1
| | * | Really fix travisDominik Schürmann2014-06-091-3/+3
| | * | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12Dominik Schürmann2014-06-093-9/+9
| | * | Fix travis for buildTools 19.1Dominik Schürmann2014-06-091-1/+1
| | * | Update buildTools to 19.1Dominik Schürmann2014-06-098-0/+0
| | * | Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
| | |/
| | * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
| | |\
| | * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0622-57/+637
| | |\ \
| | | * | Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| | | * | Fixing TAG and string resourcemar-v-in2014-06-062-4/+4
| | | * | Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
| | | * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0537-340/+214
| | | |\ \
| | | * | | Add dnsjava as submodulemar-v-in2014-06-054-1/+5
| | | * | | Show keys with android contactsmar-v-in2014-06-058-11/+119
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 05:24:09 +0000