Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |||||
| * | | added some documentation | Adithya Abraham Philip | 2015-03-13 | 2 | -27/+87 | |
| | | | ||||||
| * | | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 2 | -10/+61 | |
| | | | ||||||
| * | | links own keys to me profile in contacts | Adithya Abraham Philip | 2015-03-13 | 2 | -9/+119 | |
|/ / | ||||||
* | | Clarify logs in DeleteFileDialog | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 | |
| | | ||||||
* | | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 | |
|\ \ | | | | | | | Check if NFC is available on device | |||||
| * | | Check if NFC is available on device | Raoul | 2015-03-10 | 1 | -0/+6 | |
| | | | ||||||
* | | | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 18 | -73/+108 | |
|\ \ \ | | | | | | | | | #1042: Replaced ints with enums | |||||
| * | | | Fixed possible ArrayIndexOutOfBoundsException. | danielnelz | 2015-03-11 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 6 | -48/+51 | |
| |\| | | ||||||
| * | | | Added braces to if else. | danielnelz | 2015-03-09 | 2 | -4/+6 | |
| | | | | ||||||
| * | | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 18 | -73/+106 | |
| | | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | |||||
* | | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 2 | -6/+7 | |
| | | | | ||||||
* | | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 23 | -100/+162 | |
|\ \ \ \ | | | | | | | | | | | Updated fix for Issue #1116 | |||||
| * | | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 23 | -100/+162 | |
| | | | | | ||||||
* | | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keys | Dominik Schürmann | 2015-03-12 | 3 | -14/+53 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Sync only confirmed keys and change | |||||
| * | | | | added contact sync at end of CertifyOperation | Adithya Abraham Philip | 2015-03-11 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 2 | -14/+49 | |
| |/ / / |