Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove old screenshots, move api demo screenshots | Dominik Schürmann | 2016-01-11 | 3 | -0/+0 |
| | |||||
* | Advanced screen, warning fragment | Dominik Schürmann | 2016-01-11 | 62 | -0/+13 |
| | |||||
* | Use tor icon for settings screen | Dominik Schürmann | 2016-01-11 | 62 | -0/+13 |
| | |||||
* | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 4 | -6/+67 |
| | |||||
* | https everywhere | Dominik Schürmann | 2015-10-25 | 1 | -0/+0 |
| | |||||
* | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -0/+1 |
| | |||||
* | Use material overflow icon in decrypt list | Dominik Schürmann | 2015-09-17 | 1 | -0/+1 |
| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | ||||
* | white share icon in log display activity | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 |
| | |||||
* | multidecrypt: black share icon in bottom sheet | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 |
| | |||||
* | Add text icon in decrypt list | Dominik Schürmann | 2015-09-16 | 1 | -0/+1 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | ||||
* | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 1 | -0/+1 |
| | |||||
* | linked: use link icon from octo set? not sure yet.. | Vincent Breitmoser | 2015-09-01 | 2 | -1/+4 |
| | |||||
* | linked: update icon design of github l-id creation | Vincent Breitmoser | 2015-09-01 | 3 | -2/+4 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 6 | -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-identities | Vincent Breitmoser | 2015-05-11 | 9 | -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-identities | Vincent Breitmoser | 2015-04-26 | 1 | -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-identities | Vincent Breitmoser | 2015-04-24 | 5 | -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 tuning | Vincent Breitmoser | 2015-03-26 | 4 | -958/+8 |
| | | | | | |||||
| * | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 5 | -1/+967 |
| | | | | | |||||
| * | | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 2 | -3/+80 |
| | | | | | |||||
* | | | | | Prettify settings, rename some strings | Dominik Schürmann | 2015-08-27 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | keylist: show delete as icon in multi-select | Vincent Breitmoser | 2015-07-08 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Subtle design improvements to yubikey dialog | Dominik Schürmann | 2015-07-03 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | New notify icon | Dominik Schürmann | 2015-06-24 | 2 | -25/+39 |
| | | | | | |||||
* | | | | | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 1 | -0/+51 |
| |_|_|/ |/| | | | |||||
* | | | | Add screenshots | Dominik Schürmann | 2015-05-06 | 8 | -2/+2 |
| | | | | |||||
* | | | | Update function graphic | Dominik Schürmann | 2015-05-06 | 2 | -584/+92 |
| |_|/ |/| | | |||||
* | | | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Graphic stuff | Dominik Schürmann | 2015-04-17 | 3 | -213/+134 |
| | | |||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 2 | -2/+34 |
|/ | |||||
* | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+1 |
| | |||||
* | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 1 | -0/+3 |
| | |||||
* | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 1 | -0/+1 |
| | |||||
* | Improve icons | Dominik Schürmann | 2015-03-09 | 3 | -26/+26 |
| | |||||
* | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 71 | -1/+194 |
| | |||||
* | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 1 | -0/+1 |
| | |||||
* | Use material save icon | Dominik Schürmann | 2015-03-04 | 1 | -0/+1 |
| | |||||
* | Remove help button for now | Dominik Schürmann | 2015-03-04 | 1 | -1/+0 |
| | |||||
* | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 1 | -0/+1 |
| | |||||
* | Partially fix file names | Dominik Schürmann | 2015-03-04 | 64 | -35/+23 |
| | |||||
* | if needed change name options.templ.json | jiangkai | 2015-03-03 | 2 | -1/+4 |
| | |||||
* | get more material icon script | jiangkai | 2015-03-03 | 1 | -1/+25 |
| | |||||
* | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 65 | -62/+14 |
| | |||||
* | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 1 | -3/+2 |
| | |||||
* | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 2 | -1/+2 |
| | |||||
* | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 1 | -0/+3 |
| | |||||
* | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 1 | -5/+14 |
| | |||||
* | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 6 | -827/+196 |
| | |||||
* | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 1 | -1/+4 |
| | |||||
* | Once again: Colors and header image | Dominik Schürmann | 2015-02-22 | 97 | -1350/+5599 |
| |