aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-9/+7
| |\|
| | * progress dialog design fixDominik Schürmann2014-08-202-9/+7
| | |
| * | modifyKey: small logging changesVincent Breitmoser2014-08-202-3/+3
| |/
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-204-91/+115
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-19/+30
| | |\
| | * | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-204-91/+115
| | | |
| * | | return some more resultsDominik Schürmann2014-08-206-35/+41
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-208-54/+74
| |\| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-2015-76/+135
| | |\
| | * | consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-205-49/+67
| | | |
| | * | consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-204-5/+7
| | | |
| * | | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-207-19/+30
| | |/ | |/|
| * | Pull from transifexDominik Schürmann2014-08-2015-76/+135
| |/
| * Pull from transifexDominik Schürmann2014-08-2032-338/+1203
| |
| * Fix mime types, #781mar-v-in2014-08-192-3/+5
| |
| * Fix stringsDominik Schürmann2014-08-193-7/+7
| |
| * consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-194-35/+108
| |
| * Start consolidate activityDominik Schürmann2014-08-191-1/+8
| |
| * ConsolidateDialogActivityDominik Schürmann2014-08-192-41/+30
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-1910-27/+266
| |\
| | * stub for consolidate recovery in KeychainApplicationVincent Breitmoser2014-08-191-1/+8
| | |
| | * add ProgressFixedScaler (forgot in a previous commit)Vincent Breitmoser2014-08-191-0/+29
| | |
| | * add OpenDialogActivity (stub)Vincent Breitmoser2014-08-191-0/+117
| | |
| | * consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-197-26/+112
| | |
| * | Scroll fixes for certify activityDominik Schürmann2014-08-193-8/+21
| |/
| * Notes about criticalityDominik Schürmann2014-08-191-2/+15
| |
| * Decrease iteration count, delayed for 2.9Dominik Schürmann2014-08-191-1/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-191-1/+3
| |\
| | * fix primary user id in master key flag modificationVincent Breitmoser2014-08-191-1/+3
| | |
| * | Change criticallity of subpackets after discussionDominik Schürmann2014-08-191-5/+5
| |/
| * Use higher s2k countDominik Schürmann2014-08-191-10/+29
| |
| * Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possibleDominik Schürmann2014-08-191-20/+22
| |
| * Mark packets criticalDominik Schürmann2014-08-191-11/+11
| |
| * add feature to key sig subpacket to indicate that we want MDCDominik Schürmann2014-08-191-0/+3
| |
| * New preferred hash and symmetric algos, removed SHA-1, 3DES, new orderingDominik Schürmann2014-08-191-7/+17
| |
| * Add license headersDominik Schürmann2014-08-193-0/+51
| |
| * certs header designDominik Schürmann2014-08-191-3/+11
| |
| * Header for certs viewDominik Schürmann2014-08-193-23/+39
| |
| * Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-182-53/+75
| |
| * Fixes for expiry UIDominik Schürmann2014-08-186-69/+111
| |
| * Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-174-102/+25
| |\ | | | | | | Remove NoSwipeWrapContentViewPager
| | * Work-around rendering bug when switching back to asymmetric with multiple ↵mar-v-in2014-08-171-14/+2
| | | | | | | | | | | | recipients selected
| | * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-173-88/+23
| | |
| * | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-179-15/+302
| | |
| * | parametrize FileImportCache for filenameVincent Breitmoser2014-08-173-7/+9
| | |
| * | modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-163-3/+57
| | |
| * | use correct algorithm for signatures (actually fix heterogeneous subkeys)Vincent Breitmoser2014-08-161-4/+4
| | |
| * | fix small log format string mistake for adding subkeysVincent Breitmoser2014-08-161-1/+2
| | | | | | | | | | | | closes #768
| * | Fixing date picker issuesDominik Schürmann2014-08-162-22/+47
| | |
| * | Fix flags UI in add subkey dialogDominik Schürmann2014-08-162-5/+44
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:21:45 +0000