Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 1 | -0/+0 |
| | | | | Move launcher icons to mipmap | ||||
* | linked: use link icon from octo set? not sure yet.. | Vincent Breitmoser | 2015-09-01 | 1 | -0/+0 |
| | |||||
* | linked: update icon design of github l-id creation | Vincent Breitmoser | 2015-09-01 | 2 | -0/+0 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 6 | -0/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 2 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | | | 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-identities | Vincent Breitmoser | 2015-04-24 | 2 | -0/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 tuning | Vincent Breitmoser | 2015-03-26 | 4 | -0/+0 |
| | | | | |||||
| * | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 4 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 2 | -0/+0 |
| | | | | | |||||
* | | | | | Prettify settings, rename some strings | Dominik Schürmann | 2015-08-27 | 4 | -0/+0 |
| | | | | | |||||
* | | | | | changed orbot notification icons | Adithya Abraham Philip | 2015-08-20 | 3 | -0/+0 |
| | | | | | |||||
* | | | | | keylist: show delete as icon in multi-select | Vincent Breitmoser | 2015-07-08 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Subtle design improvements to yubikey dialog | Dominik Schürmann | 2015-07-03 | 22 | -0/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1387 from ishit/master | Dominik Schürmann | 2015-07-02 | 2 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Add visual element to verify the re-typed password. Refer #1357. | ||||
| * | | | | | Change PassphraseEditAgain status icons. | Ishit | 2015-07-02 | 2 | -0/+0 |
| | | | | | | |||||
* | | | | | | reworked keyserver preferences with recyclerview | Adithya Abraham Philip | 2015-07-02 | 2 | -0/+0 |
|/ / / / / | |||||
* | | | | | New notify icon | Dominik Schürmann | 2015-06-24 | 2 | -0/+0 |
| | | | | | |||||
* | | | | | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 1 | -0/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 2 | -0/+0 |
| |_|/ |/| | | |||||
* | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 2 | -0/+0 |
| |/ |/| | |||||
* | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 1 | -0/+0 |
|/ | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
* | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+0 |
| | |||||
* | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 3 | -0/+0 |
| | |||||
* | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 1 | -0/+0 |
| | |||||
* | Improve icons | Dominik Schürmann | 2015-03-09 | 3 | -0/+0 |
| | |||||
* | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 4 | -0/+0 |
| | |||||
* | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 2 | -0/+0 |
| | |||||
* | Use material save icon | Dominik Schürmann | 2015-03-04 | 2 | -0/+0 |
| | |||||
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 1 | -0/+0 |
|\ | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | merged dialog | Adithya Abraham Philip | 2015-02-26 | 110 | -0/+0 |
| |\ | |||||
| * | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+0 |
| | | | |||||
* | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 1 | -0/+0 |
| | | | |||||
* | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 3 | -0/+0 |
| | | | |||||
* | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 39 | -0/+0 |
| | | | |||||
* | | | delete holo icons | jiangkai | 2015-03-03 | 22 | -0/+0 |
| | | | |||||
* | | | download new material design icons | jiangkai | 2015-03-03 | 25 | -0/+0 |
| |/ |/| | |||||
* | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 72 | -0/+0 |
| | | |||||
* | | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 3 | -0/+0 |
| | | |||||
* | | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 5 | -0/+0 |
| | | |||||
* | | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 2 | -0/+0 |
| | | |||||
* | | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 3 | -0/+0 |
| | | |||||
* | | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 25 | -0/+0 |
| | | |||||
* | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 3 | -0/+0 |
| | | |||||
* | | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 1 | -0/+0 |
| | | |||||
* | | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 1 | -0/+0 |
| | | |||||
* | | Floating action button icons and methods for key list | Dominik Schürmann | 2015-02-21 | 1 | -0/+0 |
|/ | |||||
* | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | |||||
* | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 3 | -0/+0 |
| | |||||
* | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| |