Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 1 | -1/+1 |
| | |||||
* | linked: use link icon from octo set? not sure yet.. | Vincent Breitmoser | 2015-09-01 | 1 | -1/+1 |
| | |||||
* | linked: update icon design of github l-id creation | Vincent Breitmoser | 2015-09-01 | 1 | -2/+2 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md | ||||
| * | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -3/+3 |
| | | | |||||
* | | | New notify icon | Dominik Schürmann | 2015-06-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -2/+2 |
|/ | |||||
* | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 1 | -1/+1 |
| | |||||
* | Partially fix file names | Dominik Schürmann | 2015-03-04 | 1 | -35/+10 |
| | |||||
* | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 1 | -5/+14 |
| | |||||
* | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 1 | -0/+6 |
| | |||||
* | Header image tryout | Dominik Schürmann | 2015-01-29 | 1 | -0/+7 |
| | |||||
* | Cloud search icon | Dominik Schürmann | 2015-01-28 | 1 | -1/+1 |
| | |||||
* | Fix drawable sizes | Dominik Schürmann | 2015-01-14 | 1 | -3/+3 |
| | |||||
* | Reorganize folders of graphics sources | Dominik Schürmann | 2015-01-14 | 1 | -0/+66 |