aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Enable sync adapter, changelogDominik Schürmann2014-08-203-2/+8
* Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
* improve certs_textDominik Schürmann2014-08-201-1/+1
* Upload key workingDominik Schürmann2014-08-204-13/+8
* Upload key workingDominik Schürmann2014-08-201-0/+3
* Fix key sharingDominik Schürmann2014-08-201-3/+1
* Work on upload keyDominik Schürmann2014-08-201-14/+24
* Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
* Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-202-3/+3
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-9/+7
| |\
| * | modifyKey: small logging changesVincent Breitmoser2014-08-202-3/+3
* | | return some more resultsDominik Schürmann2014-08-202-6/+14
| |/ |/|
* | progress dialog design fixDominik Schürmann2014-08-202-9/+7
|/
* 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
|\|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:57:27 +0000