Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 3 | -10/+5 |
| | |||||
* | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 2 | -4/+10 |
| | |||||
* | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | |||||
* | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 2 | -74/+19 |
| | |||||
* | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 1 | -4/+7 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 12 | -99/+406 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | 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 |
| | | | |||||
| * | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -1/+0 |
| | | | |||||
| * | | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 |
| | | | |||||
| * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 3 | -63/+59 |
| | | | |||||
| * | | 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 | ||||
| * | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 1 | -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 |
| | | | |||||
| * | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -17/+58 |
| | | | |||||
| * | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -3/+8 |
| | | | |||||
| * | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 2 | -70/+115 |
| | | | |||||
| * | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 2 | -19/+88 |
| | | | |||||
| * | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -16/+85 |
| | | | |||||
| * | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 2 | -17/+100 |
| |/ | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 1 | -4/+16 |
| | | |||||
* | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 3 | -13/+23 |
| | | |||||
* | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 2 | -6/+8 |
| | | |||||
* | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 1 | -22/+19 |
| | | |||||
* | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 9 | -125/+70 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 6 | -147/+165 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -5/+15 |
| | | |||||
| * | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 1 | -4/+21 |
| | | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
| * | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 3 | -138/+107 |
| | | |||||
| * | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 1 | -0/+22 |
| | | |||||
* | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 3 | -0/+321 |
| | | |||||
* | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 2 | -27/+39 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 4 | -78/+73 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 |
| | | |||||
| * | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 1 | -2/+2 |
| | | | | | | | | duplicate | ||||
| * | API 7 | Dominik Schürmann | 2015-03-10 | 2 | -75/+70 |
| | | |||||
* | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 4 | -190/+146 |
| | | |||||
* | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 7 | -65/+84 |
| | | |||||
* | | change finish button label to "link identity" | Vincent Breitmoser | 2015-03-13 | 3 | -3/+3 |
| | | |||||
* | | fix linked wizard buttons | Vincent Breitmoser | 2015-03-12 | 6 | -27/+48 |
| | | |||||
* | | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 2 | -221/+77 |
| | | |||||
* | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 |
| | | |||||
* | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -21/+27 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 33 | -59/+193 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 22 | -37/+39 |
| | | |||||
| * | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -5/+50 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+7 |
| | | | |||||
| | * | changed default drawable for linked system contact | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+3 |
| | | |