aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'certify' into certsVincent Breitmoser2014-03-172-2/+10
|\
| * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-173-7/+72
* | certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-174-38/+70
* | certs: green dots for verified status \o/Vincent Breitmoser2014-03-151-2/+10
* | certs: provider cleanup and bugfixingVincent Breitmoser2014-03-155-65/+74
* | Merge branch 'certify' into certsVincent Breitmoser2014-03-158-217/+525
|\ \
| * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-152-6/+63
| |/
| * certify: sign individual UIDsVincent Breitmoser2014-03-153-12/+31
| * certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| * certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-1/+98
| * certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
| * certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-152-12/+82
| * certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+10
| * certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
| * move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
* | Merge branch 'master' into certsVincent Breitmoser2014-03-15107-2184/+2130
|\|
| * Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| * Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
| * final code style changesuberspot2014-03-1312-106/+132
| * fix code style in /pgpuberspot2014-03-1311-491/+436
| * final ui code style changesuberspot2014-03-1312-53/+54
| * more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
| * more UI code style fixesuberspot2014-03-139-70/+77
| * More code style fixes for /uiuberspot2014-03-1316-53/+91
| * First code style changes in uiuberspot2014-03-1356-634/+486
| * Fix code style in /helperuberspot2014-03-135-71/+64
| * Fix code style in keychain/service/uberspot2014-03-1311-87/+129
| * Optimize imports in all files, remove useless whitespace in some and fix inde...uberspot2014-03-1311-128/+80
| * Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
| |\
| | * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
| |\ \
| | * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| | |\ \
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | | |/
| * | / Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
| |/ /
| * | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
| * | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| * | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-28/+118
| |\|
| | * Export cancellable - minor changesgrait2014-03-133-6/+10
| | * Export is cancellable nowgrait2014-03-133-16/+52
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| | |\
| | | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1016-203/+344
| | | |\
| | | * | Lint changes after testingBhargav Golla2014-03-102-1/+2
| | * | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
| * | | | merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
| * | | | remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14
| * | | | keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-132-56/+47
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-1259-904/+1797
|\| | | |
| * | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-731/+483
| |\ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:03:57 +0000