aboutsummaryrefslogtreecommitdiffstats
path: root/Graphics/drawables
Commit message (Collapse)AuthorAgeFilesLines
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-011-0/+3
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-012-0/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-295-0/+93
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-586/+94
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-244-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
| * | | more linked id ui fine tuningVincent Breitmoser2015-03-264-958/+8
| | | |
| * | | some linked id ui fine tuningVincent Breitmoser2015-03-264-0/+966
| | | |
| * | | work on certification uiVincent Breitmoser2015-03-151-0/+77
| | | |
* | | | New notify iconDominik Schürmann2015-06-241-24/+38
| | | |
* | | | New all-white status bar icon to fix issue #1356moparisthebest2015-06-221-0/+51
| |_|/ |/| |
* | | Add screenshotsDominik Schürmann2015-05-061-2/+2
| | |
* | | Update function graphicDominik Schürmann2015-05-062-584/+92
| |/ |/|
* | Graphic stuffDominik Schürmann2015-04-173-213/+134
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-0/+32
|/
* Improve iconsDominik Schürmann2015-03-093-26/+26
|
* Tryout design for encrypt, decryptDominik Schürmann2015-03-0670-0/+193
|
* Partially fix file namesDominik Schürmann2015-03-0463-0/+13
|
* Invoke NFC buttonDominik Schürmann2015-02-2564-61/+13
|
* First work on new key view toolbarDominik Schürmann2015-02-255-826/+195
|
* Once again: Colors and header imageDominik Schürmann2015-02-2297-1350/+7801
|
* Floating action button icons and methods for key listDominik Schürmann2015-02-2163-0/+1649
|
* Improve nav drawer drawableDominik Schürmann2015-02-031-137/+137
|
* Improve nav drawer drawableDominik Schürmann2015-02-031-2/+2
|
* Fix first time wizard designDominik Schürmann2015-02-033-55/+55
|
* Floating Action Button added in app settingsDominik Schürmann2015-02-031-643/+247
|
* Header exportedDominik Schürmann2015-01-301-1/+4
|
* Header image tryoutDominik Schürmann2015-01-291-0/+2029
|
* Cloud search iconDominik Schürmann2015-01-283-0/+56
|
* Reorganize folders of graphics sourcesDominik Schürmann2015-01-14131-0/+25654
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 01:10:13 +0000