aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Fix result passingDominik Schürmann2014-10-252-2/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-253-2/+11
|\
| * slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-253-141/+234
| |\
| * | change the way merging is loggedVincent Breitmoser2014-10-253-2/+10
* | | Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
| |/ |/|
* | 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-253-23/+52
|\|
| * 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-251-1/+2
| * add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-252-23/+49
* | Safe slinger activity prepsDominik Schürmann2014-10-253-141/+231
|/
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-241-5/+6
|\
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-5/+6
* | 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-2310-47/+81
| |\ \
| * | | integrate download from keyserver into key import operationVincent Breitmoser2014-10-239-126/+165
* | | | Start safe slinger activityDominik Schürmann2014-10-231-0/+43
* | | | Externalize QR Code scanning and import into its own activity for better code...Dominik Schürmann2014-10-235-116/+232
| |/ / |/| |
* | | 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-152-6/+6
* | More color/icon consistencyDominik Schürmann2014-10-155-20/+21
|/
* color experimentsDominik Schürmann2014-10-154-76/+82
* 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-131-27/+27
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-135-2/+52
|\
| * Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-135-2/+52
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-134-120/+35
* | 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-134-141/+212
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-124-42/+66
* fix logging in consolidate, part 2Vincent Breitmoser2014-10-111-11/+14
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-113-11/+117
* fix logging in consolidate, part 1Vincent Breitmoser2014-10-111-43/+47
* move delete into operation classVincent Breitmoser2014-10-114-33/+159
* move around package structure a bitVincent Breitmoser2014-10-1045-114/+99
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-105-64/+89
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-102-8/+118
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:08:46 +0000