Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.6.0 dev into master. #248

Merged
merged 85 commits into from Apr 12, 2016
Merged

Merge 2.6.0 dev into master. #248

merged 85 commits into from Apr 12, 2016

Conversation

aarontam
Copy link
Contributor

It's time!

Enyo-DCO-1.1-Signed-off-by: Aaron Tam aaron.tam@lge.com

Ryan Duffy and others added 30 commits April 10, 2015 16:24
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)
Updating contribution guidelines
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
ENYO-1526 Convert inline docs to modules

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Ryan Duffy (ryan.duffy@lge.com)
Issue: ENYO-1521
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)
ENYO-1521 Updated way modules are documented

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Ryan Duffy (ryan.duffy@lge.com)
…API docs.

Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Issue: ENYO-1547
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
ENYO-1547 integration

Reviewed-By: Gray Norton (gray.norton@lge.com)
Integrated-By: Gray Norton (gray.norton@lge.com)
Enyo-DCO-1.1-Signed-off-by: Blake Stephens <blake.stephens@lge.com>
Issue: ENYO-2356
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
Fixes ENYO-2356

Reviewed-By: Krishna Rangarajan (krishna.rangarajan@lge.com)
Reviewed-by: Roy Sutton (roy.sutton@lge.com)
Integrated-By: Ryan Duffy (ryan.duffy@lge.com)
Issue: ENYO-2414
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)
webOS101 and others added 29 commits January 14, 2016 19:49
ENYO-2979: Fix incorrect image asset paths.
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
ENYO-3018 Fixup doc deficiencies

Reviewed-By: Stephen Choi (stephen.choi@lge.com)
Integrated-By: Aaron Tam (aaron.tam@lge.com)
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
ENYO-3056: Add background image scaling for basic RI in Onyx

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Aaron Tam (aaron.tam@lge.com)
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
Enyo-DCO-1.1-Signed-off-by: Roy Sutton <roy.sutton@lge.com>
ENYO-1847 Added non-iLib versions of Date/Time pickers

Reviewed-By: Aaron Tam (aaron.tam@lge.com)
Integrated-By: Ryan Duffy (ryan.duffy@lge.com)
ENYO-3047 Update (allthedependencies)

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Aaron Tam (aaron.tam@lge.com)
Enyo-DCO-1.1-Signed-off-by: Derek Tor derek.tor@lge.com
Issue: ENYO-3126
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Fixes ENYO-3126 add default selectedClass for onyx/Item
Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
ENYO-3144: Use container-based infrastructure for Travis.
…rflow

Enyo-DCO-1.1-Signed-off-by: Blake Stephens <blake.stephens@lge.com>
ENYO-3179: Un-auto-scaling the spinner so it doesn't accidentally overflow

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Aaron Tam (aaron.tam@lge.com)
Adding missing commit from previous merge.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
Remove Checkbox IE8 support
ENYO-3019: IE8 Support Removal

Reviewed-By: Ryan Duffy (ryan.duffy@lge.com)
Integrated-By: Aaron Tam (aaron.tam@lge.com)
Like moonstone, we'll rely on the active locale of ilib rather than
control-specific locales.

Issue: ENYO-3180
Enyo-DCO-1.1-Signed-off-by: Ryan Duffy (ryan.duffy@lge.com)
Fixes ENYO-3180 remove locale property from DatePicker and TimePicker
ENYO-3111: deleted i18n package.json
@webOS101 webOS101 merged commit 919ea0d into master Apr 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants