aboutsummaryrefslogtreecommitdiffstats
path: root/Graphics/update-drawables.sh
Commit message (Collapse)AuthorAgeFilesLines
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-011-1/+1
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-011-2/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-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-identitiesVincent Breitmoser2015-04-241-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 tuningVincent Breitmoser2015-03-261-1/+1
| | |
| * | work on certification uiVincent Breitmoser2015-03-151-3/+3
| | |
* | | New notify iconDominik Schürmann2015-06-241-1/+1
| |/ |/|
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-2/+2
|/
* Tryout design for encrypt, decryptDominik Schürmann2015-03-061-1/+1
|
* Partially fix file namesDominik Schürmann2015-03-041-35/+10
|
* Invoke NFC buttonDominik Schürmann2015-02-251-1/+1
|
* Use material icon for safeslingerDominik Schürmann2015-02-251-1/+1
|
* Bigger status icon in key viewDominik Schürmann2015-02-251-5/+14
|
* First work on new key view toolbarDominik Schürmann2015-02-251-1/+1
|
* Fix first time wizard designDominik Schürmann2015-02-031-0/+6
|
* Header image tryoutDominik Schürmann2015-01-291-0/+7
|
* Cloud search iconDominik Schürmann2015-01-281-1/+1
|
* Fix drawable sizesDominik Schürmann2015-01-141-3/+3
|
* Reorganize folders of graphics sourcesDominik Schürmann2015-01-141-0/+66