aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* slightly change wording in merge logsVincent Breitmoser2014-10-252-2/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-257-152/+353
|\
| * Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
| * Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
| * Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-254-23/+62
| |\
| * | Safe slinger activity prepsDominik Schürmann2014-10-257-152/+350
* | | change the way merging is loggedVincent Breitmoser2014-10-254-3/+15
| |/ |/|
* | change indentation of import logsVincent Breitmoser2014-10-251-10/+10
* | set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
* | more work on import loggingVincent Breitmoser2014-10-252-6/+7
* | add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-253-23/+59
|/
* Qr code button textDominik Schürmann2014-10-242-2/+2
* remove space in on large devices in layouts where no drawer nav is shownDominik Schürmann2014-10-243-142/+0
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-244-72/+32
|\
| * reword sync messageTim Bray2014-10-221-1/+1
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-214-72/+32
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-239-128/+167
|\ \
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-2313-61/+93
| |\ \
| * | | integrate download from keyserver into key import operationVincent Breitmoser2014-10-239-126/+165
* | | | Start safe slinger activityDominik Schürmann2014-10-232-0/+69
* | | | Externalize QR Code scanning and import into its own activity for better code...Dominik Schürmann2014-10-236-121/+251
| |/ / |/| |
* | | Fix crash on Android 5Dominik Schürmann2014-10-221-11/+16
| |/ |/|
* | consistency for import UIDominik Schürmann2014-10-161-5/+27
* | Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-162-8/+14
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-156-8/+60
|\|
| * some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-156-8/+60
* | More consisitencyDominik Schürmann2014-10-155-13/+11
* | More color/icon consistencyDominik Schürmann2014-10-157-27/+28
|/
* color experimentsDominik Schürmann2014-10-154-76/+82
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-143-30/+43
|\
| * Group passphrase cache settingsDominik Schürmann2014-10-132-24/+25
| * Register application/pgp-message for encrypted pgp data, more comments in Man...Dominik Schürmann2014-10-131-6/+18
* | fix test for new PgpDecryptVerifyVincent Breitmoser2014-10-141-1/+3
* | fix export performance problemsVincent Breitmoser2014-10-141-0/+5
* | actually remove filter spinner code. that's what git is for~Vincent Breitmoser2014-10-131-46/+0
|/
* Remove key list filter for nowDominik Schürmann2014-10-132-29/+29
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-1312-7/+61
|\
| * wordingDominik Schürmann2014-10-131-3/+3
| * Better qr code iconDominik Schürmann2014-10-134-0/+0
| * Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-138-4/+58
* | fix syntax typo in androidmanifestVincent Breitmoser2014-10-131-1/+1
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-134-120/+35
* | forgot to remove AddKeysActivity in androidmanifestVincent Breitmoser2014-10-131-11/+0
* | remove DELETE_FILE_SECURELYVincent Breitmoser2014-10-131-23/+0
|/
* forgot committing ExportResult classVincent Breitmoser2014-10-131-0/+60
* remove outdated AddKeysActivityVincent Breitmoser2014-10-131-463/+0
* rewrite export with new operation styleVincent Breitmoser2014-10-135-141/+236
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-124-42/+66
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:00:05 +0000