aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Work-around rendering bug when switching back to asymmetric with multiple rec...mar-v-in2014-08-171-14/+2
| * 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
* | Fixing date picker issuesDominik Schürmann2014-08-162-22/+47
* | Fix flags UI in add subkey dialogDominik Schürmann2014-08-162-5/+44
* | Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master keyDominik Schürmann2014-08-161-1/+1
* | Fix expiry when adding subkeysDominik Schürmann2014-08-163-6/+5
* | Always return a SaveKeyringResult from savingDominik Schürmann2014-08-162-4/+7
* | Fix and simplify in OperationResultParcelDominik Schürmann2014-08-161-11/+7
* | fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-4/+3
* | tests: add test for master key revocationVincent Breitmoser2014-08-161-2/+1
* | tests: more expected error typesVincent Breitmoser2014-08-161-1/+2
* | typed expected failures and a couple minor thingsVincent Breitmoser2014-08-1614-22/+12
* | support for master key modifications, among other stuffVincent Breitmoser2014-08-168-188/+318
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-163-1/+11
* | modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-163-0/+14
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pr...Dominik Schürmann2014-08-164-75/+96
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:37:10 +0000