Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #368 from ajit766/master | Dominik Schürmann | 2014-03-09 | 1 | -0/+5 | |
|\ \ \ | ||||||
| * | | | progress bar while key creation - added plurals based on no.of keys while key... | grait | 2014-03-09 | 1 | -1/+6 | |
| * | | | progress bar during key creation - minor text change | grait | 2014-03-09 | 1 | -1/+1 | |
* | | | | Issue #178 - Hide advanced options in EncryptActivity | rafaelav | 2014-03-09 | 2 | -40/+76 | |
|/ / / | ||||||
* | | | Merge pull request #369 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-09 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 1 | -2/+2 | |
* | | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -1/+1 | |
* | | | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 1 | -0/+6 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Added handling for other exceptions in the ImportListLoader. | Daniel Haß | 2014-03-03 | 1 | -0/+5 | |
| * | | | Added FileHasNoContent string | Daniel Haß | 2014-03-03 | 1 | -0/+1 | |
* | | | | Merge pull request #366 from uberspot/master | Dominik Schürmann | 2014-03-07 | 10 | -10/+13 | |
|\ \ \ \ | ||||||
| * | | | | move hardcode strings to strings.xml | uberspot | 2014-03-07 | 10 | -10/+13 | |
* | | | | | 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, be... | Dominik Schürmann | 2014-03-07 | 2 | -8/+7 | |
* | | | | 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 | 2 | -0/+15 | |
* | | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 14 | -20/+20 | |
|\ \ \ | ||||||
| * | | | corrected commit | Ankush | 2014-03-07 | 14 | -20/+20 | |
* | | | | Multiselect: Create 'select all' in public and secret keylist | uberspot | 2014-03-06 | 7 | -0/+9 | |
* | | | | add lock icon for 'Encrypt to..' multiselect option | uberspot | 2014-03-06 | 5 | -0/+1 | |
* | | | | Add search icon for other dpi | uberspot | 2014-03-06 | 3 | -0/+0 | |
* | | | | Merge pull request #342 from mb-14/search | Dominik Schürmann | 2014-03-06 | 3 | -1/+14 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Implement search for SelectPublicKeyFragment | Miroojin Bakshi | 2014-03-06 | 1 | -0/+8 | |
| * | | | Implement search for KeyListPublicFragment | Miroojin Bakshi | 2014-03-06 | 2 | -1/+6 | |
* | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain... | Miroojin Bakshi | 2014-03-06 | 17 | -305/+376 | |
|\| | | | ||||||
| * | | | Merge pull request #339 from uberspot/master | Dominik Schürmann | 2014-03-05 | 4 | -16/+87 | |
| |\ \ \ | ||||||
| | * | | | Put Preferences in subscreen | uberspot | 2014-03-05 | 4 | -16/+87 | |
| * | | | | Lint Issue: | Daniel Hammann | 2014-03-05 | 10 | -263/+263 | |
| |/ / / | ||||||
| * | / | Update from transifex | Dominik Schürmann | 2014-03-04 | 8 | -26/+26 | |
| | |/ | |/| | ||||||
* / | | Use string from strings.xml | Miroojin Bakshi | 2014-03-06 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #315 from jessicayuen/master | Dominik Schürmann | 2014-03-04 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cance... | Jessica Yuen | 2014-03-02 | 1 | -0/+1 | |
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-03 | 3 | -6/+6 | |
|\ \ \ | ||||||
| * | | | Fix ScrollViewSize Lint Warnings | Emantor | 2014-03-03 | 3 | -6/+6 | |
| | |/ | |/| | ||||||
* / | | change ordering in Intent descriptions for better readability in small dialogs | Dominik Schürmann | 2014-03-03 | 1 | -4/+4 | |
|/ / | ||||||
* / | Update from transifex | Dominik Schürmann | 2014-03-02 | 39 | -276/+626 | |
|/ | ||||||
* | Added error strings for key import from keyserver | Daniel Haß | 2014-02-27 | 1 | -0/+3 | |
* | Removed Thumbs.db,added to gitignore | Nikhil Peter Raj | 2014-02-25 | 4 | -0/+0 | |
* | Fix for #266 | Nikhil Peter Raj | 2014-02-25 | 8 | -0/+0 | |
* | Update help_start.html | Dominik Schürmann | 2014-02-23 | 1 | -1/+1 | |
* | rename | Dominik Schürmann | 2014-02-21 | 2 | -7/+7 | |
* | rename to OpenKeychain | Dominik Schürmann | 2014-02-21 | 2 | -8/+8 | |
* | Updated library section (AppMsg library) | Daniel Haß | 2014-02-20 | 1 | -1/+2 | |
* | Update from transifex | Dominik Schürmann | 2014-02-19 | 15 | -123/+344 | |
* | certifications text | Dominik Schürmann | 2014-02-19 | 1 | -0/+7 | |
* | add integrity check | Dominik Schürmann | 2014-02-18 | 1 | -0/+1 | |
* | merge internal signText and signAndEncrypt methods | Dominik Schürmann | 2014-02-18 | 1 | -1/+1 | |
* | 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 | |
* | warn that key generation takes looong | Dominik Schürmann | 2014-02-15 | 1 | -1/+1 |