Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -16/+41 | |
| | | | | keys | |||||
* | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 1 | -0/+28 | |
| | ||||||
* | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 | |
| | ||||||
* | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 1 | -5/+42 | |
| | ||||||
* | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -12/+21 | |
| | ||||||
* | Fix menu | Dominik Schürmann | 2015-02-25 | 1 | -0/+2 | |
| | ||||||
* | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 1 | -33/+221 | |
| | ||||||
* | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 1 | -4/+6 | |
| | ||||||
* | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -40/+111 | |
| | ||||||
* | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 1 | -33/+17 | |
| | ||||||
* | New advanced key view | Dominik Schürmann | 2015-02-23 | 1 | -5/+5 | |
| | ||||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -1/+1 | |
| | ||||||
* | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 1 | -24/+9 | |
| | ||||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 | |
| | ||||||
* | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -4/+7 | |
| | ||||||
* | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 1 | -74/+4 | |
| | ||||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 1 | -10/+2 | |
| | ||||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 | |
| | ||||||
* | Add null check when retrieving key ids from contacts api | Dominik Schürmann | 2014-10-02 | 1 | -0/+7 | |
| | ||||||
* | Beautify key id (thanks to Tim Bray) | Dominik Schürmann | 2014-09-19 | 1 | -2/+1 | |
| | ||||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -6/+6 | |
| | | | | created ui.util for everything related to formatting | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -3/+3 | |
| | ||||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -1/+1 | |
| | ||||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -1/+1 | |
| | ||||||
* | remember "show advanced tabs" setting | Vincent Breitmoser | 2014-08-31 | 1 | -4/+7 | |
| | | | | Closes #669 | |||||
* | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -2/+6 | |
| | ||||||
* | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 | |
| | ||||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -2/+1 | |
| | ||||||
* | Fix nullpointer, remove unused window feature | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
| | ||||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -58/+17 | |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | |||||
| * | Use darker colors | Dominik Schürmann | 2014-08-01 | 1 | -4/+4 | |
| | | ||||||
| * | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 1 | -30/+0 | |
| | | ||||||
| * | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 1 | -24/+13 | |
| | | ||||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -42/+46 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java | |||||
| * | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+4 | |
| | | ||||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -23/+10 | |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | |||||
| | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -2/+0 | |
| | | | ||||||
| | * | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -21/+10 | |
| | | | ||||||
| * | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Set visibility at last | Dominik Schürmann | 2014-07-28 | 1 | -3/+3 | |
| | | | ||||||
| * | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 1 | -19/+36 | |
| |/ | ||||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -2/+6 | |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java | |||||
| * | work on edit key | Dominik Schürmann | 2014-06-30 | 1 | -2/+1 | |
| | | ||||||
| * | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -2/+6 | |
| | | ||||||
* | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -3/+1 | |
|/ | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion) | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -0/+13 | |
|\ | ||||||
| * | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -0/+13 | |
| | | ||||||
* | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -1/+1 | |
|/ |