Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | keep up with master | Ashley Hughes | 2014-03-07 | 73 | -550/+999 |
|\ | |||||
| * | 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 |
* | | master merge | Ashley Hughes | 2014-02-22 | 95 | -807/+2265 |
|\| | |||||
| * | 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 |
| * | parse string util method, better help text for access screen | Dominik Schürmann | 2014-02-15 | 1 | -1/+1 |
| * | PendingIntent to handle user input | Dominik Schürmann | 2014-02-14 | 1 | -1/+1 |
| * | Transifex update | Dominik Schürmann | 2014-02-13 | 12 | -5/+360 |
| * | Layout fixes for registered apps | Dominik Schürmann | 2014-02-13 | 4 | -149/+150 |
| * | Pull from transifex | Dominik Schürmann | 2014-02-09 | 7 | -10/+58 |
| * | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 6 | -231/+267 |
| * | Restructuring for new API library | Dominik Schürmann | 2014-02-09 | 1 | -1/+1 |
| * | Update from transifex | Dominik Schürmann | 2014-02-08 | 34 | -186/+315 |
| * | language fixes | Dominik Schürmann | 2014-02-08 | 1 | -3/+7 |
| * | do not delete pub keys where secret key exists | Dominik Schürmann | 2014-02-06 | 1 | -0/+2 |
| * | Fix wording | Dominik Schürmann | 2014-02-05 | 1 | -2/+2 |
| * | keyserver instead of key server | Dominik Schürmann | 2014-02-05 | 4 | -15/+15 |
| * | fix certify key resource | Dominik Schürmann | 2014-02-05 | 1 | -1/+1 |
| * | Update from transifex | Dominik Schürmann | 2014-02-05 | 23 | -236/+422 |