Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 4 | -213/+166 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Graphic stuff | Dominik Schürmann | 2015-04-17 | 3 | -213/+134 |
| | | |||||
| * | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -0/+32 |
| | | |||||
* | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 4 | -958/+8 |
| | | |||||
* | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 4 | -0/+966 |
| | | |||||
* | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -0/+77 |
|/ | |||||
* | Improve icons | Dominik Schürmann | 2015-03-09 | 3 | -26/+26 |
| | |||||
* | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 70 | -0/+193 |
| | |||||
* | Partially fix file names | Dominik Schürmann | 2015-03-04 | 63 | -0/+13 |
| | |||||
* | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 64 | -61/+13 |
| | |||||
* | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 5 | -826/+195 |
| | |||||
* | Once again: Colors and header image | Dominik Schürmann | 2015-02-22 | 97 | -1350/+7801 |
| | |||||
* | Floating action button icons and methods for key list | Dominik Schürmann | 2015-02-21 | 63 | -0/+1649 |
| | |||||
* | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 1 | -137/+137 |
| | |||||
* | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 1 | -2/+2 |
| | |||||
* | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 3 | -55/+55 |
| | |||||
* | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -643/+247 |
| | |||||
* | Header exported | Dominik Schürmann | 2015-01-30 | 1 | -1/+4 |
| | |||||
* | Header image tryout | Dominik Schürmann | 2015-01-29 | 1 | -0/+2029 |
| | |||||
* | Cloud search icon | Dominik Schürmann | 2015-01-28 | 3 | -0/+56 |
| | |||||
* | Reorganize folders of graphics sources | Dominik Schürmann | 2015-01-14 | 131 | -0/+25654 |