aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-031-4/+6
| | |
* | | More toolbar fixesDominik Schürmann2015-02-031-0/+2
| | |
* | | Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-033-6/+8
| | |
* | | Floating Action Button added in app settingsDominik Schürmann2015-02-031-0/+2
| | |
* | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
| | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-314-8/+10
|\ \ \
| * | | Saving of allowed keysDominik Schürmann2015-01-291-0/+1
| | | |
| * | | Header image tryoutDominik Schürmann2015-01-292-3/+2
| | | |
| * | | Remove files related to old nav drawerDominik Schürmann2015-01-291-2/+0
| | | |
| * | | White popup themeDominik Schürmann2015-01-291-3/+7
| | | |
* | | | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
|/ / /
* | | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * | | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
| | | |
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-271-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | development
| | * | | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| | | | | |
| | * | | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
| | | | | |
* | | | | | Temporary nav drawer fixesDominik Schürmann2015-01-272-2/+11
|/ / / / /
* / / / / Material Design DrawerDominik Schürmann2015-01-261-0/+5
|/ / / /
* | | | Material Design: Full screen dialogsDominik Schürmann2015-01-262-2/+2
| | | |
* | | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+7
| | | |
* | | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
* | | Toolbar for settingsDominik Schürmann2015-01-141-1/+1
| | |
* | | Integrate QR Code library instead of requiring the app to be installed, also ↵Dominik Schürmann2015-01-141-0/+1
| | | | | | | | | | | | due to security reasons
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-0/+1
|\ \ \ | | | | | | | | | | | | development
| * | | small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
| | | |
* | | | Fix SearchViewDominik Schürmann2015-01-142-0/+22
|/ / /
* | | Better way to have dark toolbar and light themeDominik Schürmann2015-01-141-31/+0
| | |
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-1/+36
|\ \ \ | | | | | | | | | | | | development
| * | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
| | | |
| * | | support addition of user attributesVincent Breitmoser2015-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml
| * | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-1/+16
| | | |
* | | | GreenDominik Schürmann2015-01-134-1/+87
| | | |
* | | | Start working on Material DesignDominik Schürmann2015-01-133-12/+86
|/ / /
* | | OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
| | |
* | | PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
| | |
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-061-13/+31
|\ \ \ | | | | | | | | | | | | development
| * | | make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+1
| | | |
| * | | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
| | | |
| * | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-0/+8
| | | |
| * | | deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-6/+7
| | | |
| * | | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-6/+8
| | | |
| * | | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-1/+3
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-301-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * | | | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+2
| | | | |
| * | | | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-301-1/+3
| | |_|/ | |/| | | | | | | | | | notation packet
* | | | Passphrase wizard testsDominik Schürmann2015-01-061-0/+27
| |/ / |/| |
* | | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-2/+3
|/ /
* / NFC activity designDominik Schürmann2014-11-211-4/+5
|/
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
| | | | Closes #978