Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 1 | -2/+3 |
|\ | |||||
| * | Adjust encrypt layout, align signature with button | Thialfihar | 2014-03-23 | 1 | -2/+3 |
| | | |||||
* | | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 5 | -42/+138 |
|/ | |||||
* | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 1 | -18/+10 |
| | |||||
* | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 3 | -93/+115 |
| | |||||
* | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 1 | -0/+38 |
|\ | | | | | New Fix for #410 | ||||
| * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -0/+38 |
| | | |||||
* | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 1 | -3/+4 |
| | | | | | | | | and clipboard button | ||||
* | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | | |||||
* | | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -15/+15 |
| | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification. | ||||
* | | Move fingerprint to the right in key list entry | Thialfihar | 2014-03-20 | 1 | -8/+8 |
|/ | | | | Fits much better there and doesn't separate the user ID. | ||||
* | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | |||||
* | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -0/+7 |
| | |||||
* | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 1 | -0/+4 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 1 | -0/+4 |
| | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
* | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 4 | -8/+144 |
|\ \ | | | | | | | Revamp certify dialogue | ||||
| * | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -0/+87 |
| | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | ||||
| * | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 1 | -5/+34 |
| | | | |||||
| * | | certify: selectsecretkeyfragment cosmetics | Vincent Breitmoser | 2014-03-15 | 1 | -3/+12 |
| | | | |||||
| * | | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 1 | -0/+11 |
| |/ | |||||
* / | Lock drawer as open in tablets | uberspot | 2014-03-16 | 11 | -666/+693 |
|/ | |||||
* | Fix colors in item view | Dominik Schürmann | 2014-03-13 | 1 | -1/+1 |
| | |||||
* | Improve list item view, borderless button for API < 11 | Dominik Schürmann | 2014-03-13 | 2 | -54/+69 |
| | |||||
* | XML cleanup and bigger filename EditText | Dominik Schürmann | 2014-03-13 | 3 | -161/+173 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 4 | -12/+6 |
|\ | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 4 | -12/+6 |
| |\ | | | | | | | Lint error fix after testing | ||||
| | * | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 5 | -9/+119 |
| | |\ | |||||
| | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 4 | -12/+6 |
| | | | | |||||
* | | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 8 | -85/+91 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml | ||||
| * | | | add contact count to My Keys header | Vincent Breitmoser | 2014-03-08 | 1 | -1/+15 |
| | | | | |||||
| * | | | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 7 | -231/+1 |
| | | | | |||||
| * | | | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 1 | -1/+31 |
| | | | | |||||
| * | | | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 3 | -2/+97 |
| | | | | |||||
| * | | | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 2 | -0/+97 |
| | | | | |||||
* | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 3 | -3/+0 |
| | | | | | | | | | | | | | | | | imports and throw exceptions | ||||
* | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵ | uberspot | 2014-03-11 | 3 | -92/+0 |
| |_|/ |/| | | | | | | | | via the method calls | ||||
* | | | more tight layout | Dominik Schürmann | 2014-03-11 | 1 | -12/+10 |
| | | | |||||
* | | | linear layout edited to display test horizontally | Sreeram Boyapati | 2014-03-11 | 1 | -1/+4 |
| | | | |||||
* | | | Appropriate save Icon in EditKeyActivity | uberspot | 2014-03-11 | 3 | -0/+92 |
| | | | |||||
* | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 2 | -7/+24 |
|\ \ \ | |_|/ |/| | | Fix to passphrase dialog and Issue #207 | ||||
| * | | Fix to passphrase dialog and Issue #207 | Sreeram Boyapati | 2014-03-10 | 2 | -7/+24 |
| | | | |||||
* | | | @color/white instead of hex | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
* | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 7 | -11/+18 |
| | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | ||||
* | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 7 | -18/+11 |
|\ \ \ | | | | | | | | | Lint changes #223 | ||||
| * | | | Lint changes | Bhargav Golla | 2014-03-10 | 7 | -18/+11 |
| |/ / | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | ||||
* | | | Issue #178 - Hide advanced options in EncryptActivity | rafaelav | 2014-03-09 | 1 | -40/+74 |
| | | | |||||
* | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #366 from uberspot/master | Dominik Schürmann | 2014-03-07 | 9 | -10/+10 |
|\ \ | | | | | | | Minor code clean up |