Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | 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 | |||||
| | * | | move hardcode strings to strings.xml | uberspot | 2014-03-07 | 9 | -10/+10 | |
| | | | | ||||||
| * | | | Move search view into onCreateView, fixes #365 | Dominik Schürmann | 2014-03-07 | 1 | -7/+0 | |
| |/ / | ||||||
| * | | move search view from activity to fragment by setting it as a list header, ↵ | Dominik Schürmann | 2014-03-07 | 2 | -8/+7 | |
| | | | | | | | | | | | | better reusability! Required for service activites | |||||
| * | | Reworking main KeyListPublicFragment to get progress indicator | Dominik Schürmann | 2014-03-07 | 1 | -54/+85 | |
| | | | ||||||
| * | | Add option for sharing encrypted file. | Miroojin Bakshi | 2014-03-07 | 1 | -0/+13 | |
| | | | ||||||
* | | | keep up with master | Ashley Hughes | 2014-03-07 | 6 | -11/+19 | |
|\| | | ||||||
| * | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 2 | -5/+5 | |
| |\ \ | | | | | | | | | #338 | |||||
| | * | | corrected commit | Ankush | 2014-03-07 | 2 | -5/+5 | |
| | |/ | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338 | |||||
| * / | Implement search for SelectPublicKeyFragment | Miroojin Bakshi | 2014-03-06 | 1 | -0/+8 | |
| |/ | ||||||
| * | Fix ScrollViewSize Lint Warnings | Emantor | 2014-03-03 | 3 | -6/+6 | |
| | | ||||||
* | | master merge | Ashley Hughes | 2014-02-22 | 16 | -436/+565 | |
|\| | ||||||
| * | certifications text | Dominik Schürmann | 2014-02-19 | 1 | -0/+7 | |
| | | ||||||
| * | fix margins | Dominik Schürmann | 2014-02-17 | 1 | -2/+2 | |
| | | ||||||
| * | prevent key view from scrolling, move encrypt button down again | Dominik Schürmann | 2014-02-17 | 1 | -17/+21 | |
| | | ||||||
| * | Layout fixes for registered apps | Dominik Schürmann | 2014-02-13 | 4 | -149/+150 | |
| | | ||||||
| * | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 5 | -231/+265 | |
| | | ||||||
| * | fix certify key resource | Dominik Schürmann | 2014-02-05 | 1 | -1/+1 | |
| | | ||||||
| * | drawer icons have not the same width, fix this | Dominik Schürmann | 2014-02-05 | 1 | -1/+1 | |
| | |