aboutsummaryrefslogtreecommitdiffstats
path: root/Graphics
Commit message (Collapse)AuthorAgeFilesLines
* linked: add "retry"Vincent Breitmoser2015-09-081-0/+1
|
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-012-1/+4
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-013-2/+4
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-296-3/+96
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-119-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 remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-245-214/+167
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-265-1/+967
| | | | |
| * | | | work on certification uiVincent Breitmoser2015-03-152-3/+80
| | | | |
* | | | | Prettify settings, rename some stringsDominik Schürmann2015-08-271-0/+7
| | | | |
* | | | | keylist: show delete as icon in multi-selectVincent Breitmoser2015-07-081-1/+2
| | | | |
* | | | | Subtle design improvements to yubikey dialogDominik Schürmann2015-07-031-0/+3
| | | | |
* | | | | New notify iconDominik Schürmann2015-06-242-25/+39
| | | | |
* | | | | New all-white status bar icon to fix issue #1356moparisthebest2015-06-221-0/+51
| |_|_|/ |/| | |
* | | | Add screenshotsDominik Schürmann2015-05-068-2/+2
| | | |
* | | | Update function graphicDominik Schürmann2015-05-062-584/+92
| |_|/ |/| |
* | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-261-0/+2
| |/ |/|
* | Graphic stuffDominik Schürmann2015-04-173-213/+134
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-212-2/+34
|/
* Add additional email addresses in create keyDominik Schürmann2015-03-101-0/+1
|
* Make create key wizard step-by-stepDominik Schürmann2015-03-091-0/+3
|
* Redesign of encrypt activites finishedDominik Schürmann2015-03-091-0/+1
|
* Improve iconsDominik Schürmann2015-03-093-26/+26
|
* Tryout design for encrypt, decryptDominik Schürmann2015-03-0671-1/+194
|
* Design fixes for decryption screenDominik Schürmann2015-03-051-0/+1
|
* Use material save iconDominik Schürmann2015-03-041-0/+1
|
* Remove help button for nowDominik Schürmann2015-03-041-1/+0
|
* More icon naming fixes and designDominik Schürmann2015-03-041-0/+1
|
* Partially fix file namesDominik Schürmann2015-03-0464-35/+23
|
* if needed change name options.templ.jsonjiangkai2015-03-032-1/+4
|
* get more material icon scriptjiangkai2015-03-031-1/+25
|
* Invoke NFC buttonDominik Schürmann2015-02-2565-62/+14
|
* Other icon for key exchangeDominik Schürmann2015-02-251-3/+2
|
* Use material icon for safeslingerDominik Schürmann2015-02-252-1/+2
|
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-0/+3
|
* Bigger status icon in key viewDominik Schürmann2015-02-251-5/+14
|
* First work on new key view toolbarDominik Schürmann2015-02-256-827/+196
|
* Fix multi select and more colorsDominik Schürmann2015-02-221-1/+4
|
* Once again: Colors and header imageDominik Schürmann2015-02-2297-1350/+5599
|
* Floating action button icons and methods for key listDominik Schürmann2015-02-2164-1/+1653
|
* ScreenshotsDominik Schürmann2015-02-203-0/+0
|
* Screenshot for GSoCDominik Schürmann2015-02-201-0/+0
|
* 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-034-55/+61
|
* Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-031-2/+1
|
* Floating Action Button added in app settingsDominik Schürmann2015-02-032-643/+250
|
* Header exportedDominik Schürmann2015-01-301-1/+4
|
* Header image tryoutDominik Schürmann2015-01-292-0/+2036
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 02:01:07 +0000