Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -0/+11 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 4 | -0/+0 |
| | | |||||
| * | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 1 | -0/+0 |
| | | |||||
| * | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -0/+11 |
| | | |||||
| * | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 18 | -390/+23 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle | ||||
| * | | add dns button to linked identity selection | Vincent Breitmoser | 2015-01-12 | 1 | -0/+0 |
| | | | |||||
| * | | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 2 | -0/+0 |
| | | | |||||
* | | | Add missing scrim drawable | Dominik Schürmann | 2015-08-28 | 1 | -0/+8 |
| | | | |||||
* | | | fixed crash on api < 21 due to drawable using attrs | Adithya Abraham Philip | 2015-08-06 | 4 | -3/+15 |
| | | | |||||
* | | | Give key flag colors their own color names | Thialfihar | 2015-07-21 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray". | ||||
* | | | Make cardview header divider themeable | Thialfihar | 2015-07-21 | 1 | -2/+2 |
| | | | |||||
* | | | Make FAB colors themeable | Thialfihar | 2015-07-21 | 1 | -2/+2 |
| | | | |||||
* | | | Make header text and tertiary text color themeable | Thialfihar | 2015-07-21 | 1 | -2/+2 |
| | | | |||||
* | | | New NFC dialog design with indeterminate progress, do NFC stuff in background | Dominik Schürmann | 2015-07-03 | 1 | -0/+0 |
| |/ |/| | |||||
* | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 16 | -489/+0 |
| | | |||||
* | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -0/+11 |
| | | |||||
* | | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 1 | -8/+0 |
| | | |||||
* | | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 |
| | | |||||
* | | Once again: Colors and header image | 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/+8 |
| | | |||||
* | | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | | |||||
* | | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | | |||||
* | | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | | |||||
* | | Add FAB to key list | Dominik Schürmann | 2015-02-03 | 1 | -0/+11 |
| | | |||||
* | | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | | |||||
* | | Header image tryout | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | | |||||
* | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
| | | |||||
* | | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -0/+0 |
| | | |||||
* | | Green | Dominik Schürmann | 2015-01-13 | 4 | -2/+102 |
|/ | |||||
* | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+0 |
| | |||||
* | NFC activity design | Dominik Schürmann | 2014-11-21 | 2 | -0/+0 |
| | |||||
* | New decryption screen UI with modernPGP icons | Dominik Schürmann | 2014-10-08 | 3 | -0/+0 |
| | |||||
* | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 |
| | | | | need to separate | ||||
* | New key flags icons, subkey adapter redesign, support authanticate flag in ↵ | Dominik Schürmann | 2014-09-20 | 5 | -0/+0 |
| | | | | database | ||||
* | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 1 | -9/+9 |
| | |||||
* | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 1 | -0/+37 |
| | |||||
* | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -0/+0 |
| | |||||
* | Converted all other buttons | Daniel Albert | 2014-06-30 | 1 | -0/+5 |
| | |||||
* | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 3 | -3/+77 |
| | | | | Added drawables for them | ||||
* | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 1 | -0/+37 |
| | | | | select_secret_key_layout to use it | ||||
* | Improved button style | Daniel Albert | 2014-06-29 | 1 | -6/+6 |
| | | | | | centered buttons removed commented-out button | ||||
* | Added button_rounded style | Daniel Albert | 2014-06-28 | 1 | -0/+40 |
| | | | | converted decrypt_file_fragment to new style | ||||
* | ui: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+7 |
| | |||||
* | ui: purpelize fastscroll thumb | Vincent Breitmoser | 2014-05-07 | 1 | -0/+20 |
| | |||||
* | ui: apply purple theme (twi is best color) | Vincent Breitmoser | 2014-05-06 | 11 | -0/+362 |
| | |||||
* | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -2/+2 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 2 | -0/+0 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 12 | -0/+18 |