Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 18 | -235/+883 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1155 from adithyaphilip/development | Dominik Schürmann | 2015-03-17 | 1 | -16/+13 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Removed JellyBean restriction on Contact Sync | |||||
| * | | | | | | | | | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Manifest cleanup | Dominik Schürmann | 2015-03-17 | 1 | -9/+12 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #1154 from adithyaphilip/development | Dominik Schürmann | 2015-03-16 | 1 | -6/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper | |||||
| | * | | | | | | | | | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 | |
| |/ / / / / / / / / | ||||||
* / / / / / / / / / | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 13 | -33/+133 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 7 | -11/+44 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -28/+5 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | 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/+53 | |
| | | | | | | | | | ||||||
* | | | | | | | | | object oriented split user id | Dominik Schürmann | 2015-03-16 | 26 | -148/+139 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Update openpgp-api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 2 | -2/+37 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-15 | 2 | -15/+22 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | development | |||||
| * | | | | | | | | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 2 | -15/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #1141 | |||||
* | | | | | | | | | Put API activites in normal process to allow hydrate/dehydrate of logs | Dominik Schürmann | 2015-03-15 | 1 | -4/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist | Dominik Schürmann | 2015-03-15 | 1 | -1/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Add ignore dirty to other git submodules | Dominik Schürmann | 2015-03-15 | 1 | -2/+9 | |
| | | | | | | | | ||||||
* | | | | | | | | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 6 | -19/+70 | |
| | | | | | | | | ||||||
* | | | | | | | | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Preselected Suitable Key | |||||
| * \ \ \ \ \ \ \ | Merge branch 'development' of https://github.com/tdjogi010/open-keychain ↵ | tdjogi010@gmail.com | 2015-03-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java | |||||
| | * | | | | | | | | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-12 | 1 | -4/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1148 from manojkhannakm/development | Dominik Schürmann | 2015-03-15 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed a ClassCastException | |||||
| * | | | | | | | | | Fixed a ClassCastException | Manoj Khanna | 2015-03-15 | 2 | -5/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 2 | -11/+15 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se... | |||||
| * | | | | | | | | | | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 2 | -11/+15 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid | |||||
* | | | | | | | | | | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 4 | -16/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicate | |||||
* | | | | | | | | | | Use fixed version of com.squareup:fest-android, enable offline builds | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 3 | -2/+14 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Add missing license headers | Dominik Schürmann | 2015-03-15 | 6 | -0/+102 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-14 | 1 | -1/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| * | | | | | | | | | Merge pull request #1143 from manojkhannakm/development | Dominik Schürmann | 2015-03-14 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix for Issue #1115 | |||||
| | * | | | | | | | | | Fix for Issue #1115 | Manoj Khanna | 2015-03-13 | 1 | -1/+2 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | disable debug sync | Dominik Schürmann | 2015-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Use names also for main contact | Dominik Schürmann | 2015-03-14 | 2 | -4/+4 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Show key name instead of key id in contacts, cleanup | Dominik Schürmann | 2015-03-14 | 1 | -20/+7 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1144 from adithyaphilip/main-profile-keys | Dominik Schürmann | 2015-03-14 | 3 | -27/+248 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Own keys linked to "me" contact |