Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 9 | -246/+450 |
| | |||||
* | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 8 | -5/+776 |
| | |||||
* | Merge pull request #322 from mj7007/smooth_activity_switch | Dominik Schürmann | 2014-03-04 | 1 | -8/+15 |
|\ | | | | | Smooth Activity Switch Fixed | ||||
| * | Smooth Activity Switch Fixed | mj7007 | 2014-03-04 | 1 | -8/+15 |
| | | |||||
* | | Merge pull request #315 from jessicayuen/master | Dominik Schürmann | 2014-03-04 | 7 | -11/+87 |
|\ \ | | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable. | ||||
| * | | #226: Small fix to prevent message from being sent if IntentService is canceled | Jessica Yuen | 2014-03-03 | 1 | -0/+16 |
| | | | |||||
| * | | #226: Async key gen task is stopped if progress is canceled | Jessica Yuen | 2014-03-02 | 5 | -17/+40 |
| | | | |||||
| * | | #226: Activity no longer closes if progress is canceled for key creation in ↵ | Jessica Yuen | 2014-03-02 | 5 | -10/+17 |
| | | | | | | | | | | | | EditKeyActivity | ||||
| * | | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵ | Jessica Yuen | 2014-03-02 | 6 | -9/+39 |
| | | | | | | | | | | | | cancelable. | ||||
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-03 | 6 | -11/+17 |
|\ \ \ | |||||
| * \ \ | Merge pull request #319 from Emantor/lint_fix | Dominik Schürmann | 2014-03-03 | 6 | -11/+17 |
| |\ \ \ | | | | | | | | | | | Fix Lint ScrollViewSize, DefaultLocale Warnings and NewApi errors | ||||
| | * | | | Fix NewApi Lint Errors | Emantor | 2014-03-03 | 3 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing ; import android.annotation.TargetApi where needed | ||||
| | * | | | Fix DefaultLocale Lint Warnings | Emantor | 2014-03-03 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | 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 |
|/ / / / | |||||
* | | | | Put build status on top | Dominik Schürmann | 2014-03-03 | 1 | -5/+4 |
| | | | | |||||
* | | | | README link updated | Dominik Schürmann | 2014-03-03 | 1 | -4/+2 |
| | | | | |||||
* | | | | Put api docs into wiki | Dominik Schürmann | 2014-03-03 | 1 | -57/+9 |
| | | | | |||||
* | | | | Add travis status icon to README | Dominik Schürmann | 2014-03-03 | 1 | -0/+2 |
| | | | | |||||
* | | | | README | Dominik Schürmann | 2014-03-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #317 from Emantor/travis | Dominik Schürmann | 2014-03-03 | 2 | -0/+19 |
|\ \ \ \ | |/ / / |/| | | | Add travis ci support to OpenPGP-Keychain, Fix #156 | ||||
| * | | | This adds travis ci support to OpenPGP-Keychain. | Emantor | 2014-03-03 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | Currently only correct assembly is tested since upstream Spongycastle fails some of its tests. | ||||
* | | | | version code 3 API lib | Dominik Schürmann | 2014-03-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update from transifex | Dominik Schürmann | 2014-03-02 | 39 | -276/+626 |
| | | | | |||||
* | | | | add lib icons for holo light | Dominik Schürmann | 2014-03-02 | 4 | -0/+0 |
| | | | | |||||
* | | | | fixes for OpenPgpListPreference | Dominik Schürmann | 2014-03-02 | 1 | -21/+30 |
| | | | | |||||
* | | | | API changes | Dominik Schürmann | 2014-03-02 | 11 | -421/+301 |
| |/ / |/| | | |||||
* | | | Merge pull request #306 from danielhass/keyserver-conerror | Dominik Schürmann | 2014-02-28 | 5 | -27/+102 |
|\ \ \ | | | | | | | | | Show error if keyserver is not reachable | ||||
| * | | | Some clean up | Daniel Haß | 2014-02-28 | 1 | -4/+2 |
| | | | | |||||
| * | | | Added different notifys for different exceptions | Daniel Haß | 2014-02-27 | 1 | -6/+17 |
| | | | | |||||
| * | | | Added error strings for key import from keyserver | Daniel Haß | 2014-02-27 | 1 | -0/+3 |
| | | | | |||||
| * | | | Added StackOverflow link to documentation | Daniel Haß | 2014-02-27 | 1 | -0/+2 |
| | | | | |||||
| * | | | Added documentation to the AsyncTaskResultWrapper | Daniel Haß | 2014-02-27 | 1 | -0/+5 |
| | | | | |||||
| * | | | Adapted the ImportKeysLoader to work with the new AsyncWrapper | Daniel Haß | 2014-02-26 | 3 | -9/+13 |
| | | | | |||||
| * | | | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ↵ | Daniel Haß | 2014-02-26 | 2 | -20/+34 |
| | | | | | | | | | | | | | | | | temporarily disabled | ||||
| * | | | Added the AsyncTaskResultWrapper | Daniel Haß | 2014-02-26 | 1 | -0/+38 |
| | | | | |||||
* | | | | Merge pull request #311 from emdete/master | Dominik Schürmann | 2014-02-28 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | prevent null byte[] in case of encoding exc | ||||
| * | | | prevent null byte[] in case of encoding exc | M. Dietrich | 2014-02-28 | 1 | -3/+3 |
| | | | | |||||
* | | | | Fix binding of install intents to package | Dominik Schürmann | 2014-02-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | cleanup | Dominik Schürmann | 2014-02-27 | 4 | -40/+22 |
| | | | | |||||
* | | | | remove dublication of api library, let both proejcts depend on the same | Dominik Schürmann | 2014-02-27 | 22 | -1339/+2 |
| | | | | |||||
* | | | | Merge pull request #305 from hav3n/branch-dialog-fragment | Dominik Schürmann | 2014-02-27 | 4 | -126/+272 |
|\ \ \ \ | | | | | | | | | | | Partial fix for #304 | ||||
| * | | | | Added GPL headers | Nikhil Peter Raj | 2014-02-27 | 2 | -11/+31 |
| | | | | | |||||
| * | | | | Complete fix for #304 | Nikhil Peter Raj | 2014-02-27 | 2 | -94/+170 |
| | | | | | |||||
| * | | | | Partial fix for #304 | Nikhil Peter Raj | 2014-02-26 | 2 | -32/+82 |
| | | | | | |||||
* | | | | | Merge pull request #308 from mar-v-in/issue-295 | Dominik Schürmann | 2014-02-27 | 2 | -3/+48 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Show link to Market if no openpgp provider installed installed | ||||
| * | | | | Change resource name and remove unneeded if from 44232af | mar-v-in | 2014-02-27 | 2 | -13/+11 |
| | | | | | |||||
| * | | | | Show link to Market if no openpgp provider installed installed | mar-v-in | 2014-02-27 | 2 | -3/+50 |
|/ / / / | | | | | | | | | | | | | Issue #295 |