Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Switch to html-textview from JCenter | Dominik Schürmann | 2015-04-12 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-04-10 | 1 | -0/+0 |
| | |||||
* | update OpenPgpApi, re-add EXTRA_PASSPHRASE | Vincent Breitmoser | 2015-03-30 | 1 | -0/+0 |
| | |||||
* | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵ | Dominik Schürmann | 2015-03-30 | 2 | -0/+0 |
| | | | | git submodules | ||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 2 | -0/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | translation fixes | Dominik Schürmann | 2015-03-23 | 1 | -0/+0 |
| | | |||||
| * | Update build env and plugins | Dominik Schürmann | 2015-03-23 | 1 | -0/+0 |
| | | |||||
| * | Merge pull request #1170 from manojkhannakm/development | Dominik Schürmann | 2015-03-22 | 1 | -0/+0 |
| |\ | | | | | | | Updated openpgp-api-lib | ||||
| | * | Updated openpgp-api-lib | Manoj Khanna | 2015-03-22 | 1 | -0/+0 |
| | | | |||||
* | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 |
|\| | | |||||
| * | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 |
| |/ | |||||
* / | forgot spongycastle update | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 |
|/ | |||||
* | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 |
| | |||||
* | Update OpenPGP API lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 |
| | |||||
* | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 |
| | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Update openpgp-api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Update openpgp lib | Dominik Schürmann | 2015-03-10 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-10 | 1 | -0/+0 |
| | |||||
* | Update API lib | Dominik Schürmann | 2015-03-02 | 1 | -0/+0 |
| | |||||
* | Removed unused submodules | Dominik Schürmann | 2015-03-02 | 3 | -0/+0 |
| | |||||
* | Use SDK and build tools versions from root project | Dominik Schürmann | 2015-03-02 | 7 | -0/+0 |
| | |||||
* | Removed submodule android-lockpattern | Dominik Schürmann | 2015-02-23 | 1 | -0/+0 |
| | |||||
* | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+0 |
| | |||||
* | Fix travis for build tools update | Dominik Schürmann | 2015-01-30 | 1 | -0/+0 |
| | |||||
* | Update mini dns lib | Dominik Schürmann | 2015-01-30 | 1 | -0/+0 |
| | |||||
* | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | |||||
* | Fix item layout in apps list | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | |||||
* | Cloud search icon | Dominik Schürmann | 2015-01-28 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
| | |||||
* | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
| | |||||
* | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+0 |
| | | | | | | | | - 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 | ||||
* | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -0/+0 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+0 |
|\ | | | | | | | development | ||||
| * | update spongycastle with more public methods for WrappedUserAttribute | Vincent Breitmoser | 2015-01-13 | 1 | -0/+0 |
| | | |||||
* | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 1 | -0/+0 |
|/ | |||||
* | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 |
| | |||||
* | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -0/+0 |
| | | | | closes #1012 | ||||
* | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+0 |
| | |||||
* | Update plugin to 1.0 | Dominik Schürmann | 2014-12-12 | 2 | -0/+0 |
| | |||||
* | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 |
| | |||||
* | Update safeslinger lib | Dominik Schürmann | 2014-10-25 | 1 | -0/+0 |
| | |||||
* | Update safeslinger lib | Dominik Schürmann | 2014-10-07 | 1 | -0/+0 |
| |