aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Dominik Schürmann2014-10-253-23/+52
|\ | | | | | | development
| * 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-explanatory
| * 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 ↵Dominik Schürmann2014-10-239-128/+167
|\ \ | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-2310-47/+81
| |\ \ | | | | | | | | | | | | development
| * | | 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 ↵Dominik Schürmann2014-10-235-116/+232
| |/ / |/| | | | | | | | code separation
* | | 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 ↵Dominik Schürmann2014-10-156-8/+60
|\| | | | | | | development
| * 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 ↵Vincent Breitmoser2014-10-135-2/+52
|\ | | | | | | development
| * 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
|/ | | | closes #961
* 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
|
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-102-13/+182
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-0921-78/+140
|\
| * Better handling if no api key is selectedDominik Schürmann2014-10-091-1/+1
| |
| * Better handling if no api key is selectedDominik Schürmann2014-10-092-8/+14
| |
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-0920-70/+126
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 07:14:01 +0000