aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
|
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-244-72/+32
|\ | | | | Make the Certify screen a little more self-explanatory
| * 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 ↵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-2313-61/+93
| |\ \ | | | | | | | | | | | | development
| * | | 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 ↵Dominik Schürmann2014-10-236-121/+251
| |/ / |/| | | | | | | | 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-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 ↵Vincent Breitmoser2014-10-143-30/+43
|\ | | | | | | development
| * Group passphrase cache settingsDominik Schürmann2014-10-132-24/+25
| |
| * Register application/pgp-message for encrypted pgp data, more comments in ↵Dominik Schürmann2014-10-131-6/+18
| | | | | | | | Manifest
* | fix test for new PgpDecryptVerifyVincent Breitmoser2014-10-142-16/+35
| |
* | 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 ↵Vincent Breitmoser2014-10-1314-611/+2357
|\ | | | | | | development
| * wordingDominik Schürmann2014-10-131-3/+3
| |
| * Better qr code iconDominik Schürmann2014-10-136-604/+2296
| |
| * Merge pull request #963 from jkolo/feature/numpad4yubikeyDominik Schürmann2014-10-138-4/+58
| |\ | | | | | | Added option for num keypad for YubiKey
| | * 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-135-120/+36
| |
* | forgot to remove AddKeysActivity in androidmanifestVincent Breitmoser2014-10-131-11/+0
| |
* | 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-135-141/+236
|
* 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-114-11/+137
|
* fix logging in consolidate, part 1Vincent Breitmoser2014-10-111-43/+47
|
* move delete into operation classVincent Breitmoser2014-10-115-33/+177
|
* move around package structure a bitVincent Breitmoser2014-10-1052-130/+115
|
* different wording in share tabVincent Breitmoser2014-10-101-1/+1
|
* fix width of displayed qr codeVincent Breitmoser2014-10-101-1/+1
|
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-105-64/+89
|
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-103-9/+119
|
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-103-13/+208
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-0922-98/+168
|\
| * 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-093-28/+42
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 14:42:29 +0000