Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update in-app contributor list | Dominik Schürmann | 2015-04-25 | 1 | -3/+22 |
| | |||||
* | Update lib section in about | Dominik Schürmann | 2015-04-25 | 1 | -2/+2 |
| | |||||
* | Remove old navigation drawer dependency | Dominik Schürmann | 2015-04-25 | 2 | -9/+1 |
| | |||||
* | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer | Dominik Schürmann | 2015-04-25 | 2 | -0/+28 |
|\ | | | | | Switch to MaterialDrawer library | ||||
| * | Fix #1197 Switch to MaterialDrawer library | vectorijk | 2015-04-24 | 1 | -2/+4 |
| | | |||||
| * | Introduce and Switch to mikepenz/MaterialDrawer | vectorijk | 2015-04-24 | 2 | -0/+26 |
| | | |||||
* | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | | |||||
* | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 4 | -81/+44 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-22 | 4 | -16/+57 |
|\ | | | | | | | development | ||||
| * | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 3 | -16/+16 |
| | | | | | | | | Surrounded string with quotes | ||||
| * | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 2 | -0/+41 |
| | | |||||
* | | Update changelog | Dominik Schürmann | 2015-04-22 | 1 | -6/+8 |
|/ | |||||
* | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -0/+3 |
| | |||||
* | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -5/+5 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 |
| | |||||
* | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -0/+1 |
|\ | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | ||||
| * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -0/+1 |
| | | |||||
* | | Rename advanced to extended | Dominik Schürmann | 2015-03-31 | 1 | -7/+7 |
| | | |||||
* | | From passphrase to password | Dominik Schürmann | 2015-03-31 | 1 | -47/+47 |
| | | |||||
* | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 2 | -2/+1 |
| | | |||||
* | | Merge branch 'v/crypto-input-parcel' of ↵ | Vincent Breitmoser | 2015-03-30 | 3 | -63/+60 |
|\ \ | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | ||||
| * | | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 |
| | | | |||||
| * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 3 | -63/+59 |
| | | | |||||
* | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 3 | -13/+23 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | ||||
| * | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 3 | -13/+23 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | ||||
* | | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -0/+1 |
|\| | |||||
| * | -Fixed a situation where additional emails could be duplicated when creating ↵ | Daniel Ramos | 2015-03-27 | 1 | -0/+1 |
| | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. | ||||
* | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 3 | -2/+1 |
| | | |||||
* | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 1 | -4/+3 |
| | | |||||
* | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 3 | -10/+8 |
| | | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 191 | -7866/+9358 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| | | |||||
| * | translation fixes | Dominik Schürmann | 2015-03-23 | 8 | -113/+93 |
| | | |||||
| * | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 4 | -11/+16 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2015-03-23 | 110 | -199/+8849 |
| | | |||||
| * | Remove remaining html entities in changelog | Dominik Schürmann | 2015-03-23 | 1 | -3/+3 |
| | | |||||
| * | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
| * | Markdown comments | Dominik Schürmann | 2015-03-23 | 5 | -5/+5 |
| | | |||||
| * | Remove changelog in main folder, update comments | Dominik Schürmann | 2015-03-23 | 4 | -0/+4 |
| | | |||||
| * | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 78 | -7635/+481 |
| | | |||||
* | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| | | |||||
* | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| | | |||||
* | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -1/+2 |
| | | |||||
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 2 | -23/+66 |
| | | |||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+3 |
| | | |||||
* | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 2 | -3/+12 |
| | | |||||
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 3 | -70/+117 |
| | | |||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 11 | -19/+88 |
| | |