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.

Sign up for GitHub

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

Jump to bottom

Inherit select classes #917

Merged
merged 5 commits into from
Dec 12, 2012
Merged

Inherit select classes #917

merged 5 commits into from
Dec 12, 2012

Commits on Nov 29, 2012

  1. Apply classses to the Chosen container in a more flexible way.

    @pfiller
    pfiller committed Nov 29, 2012
    Configuration menu
    Copy the full SHA
    fbee17d View commit details
    Browse the repository at this point in the history

  2. Keep the original form field's classes.

    @pfiller
    pfiller committed Nov 29, 2012
    Configuration menu
    Copy the full SHA
    dd857e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2012

  1. Merge branch 'master' into inherit-select-classes 

    Conflicts:
	chosen/chosen.jquery.min.js
	chosen/chosen.proto.min.js
	coffee/chosen.proto.coffee
    @pfiller
    pfiller committed Dec 11, 2012
    Configuration menu
    Copy the full SHA
    064c83e View commit details
    Browse the repository at this point in the history

  2. Merge master

    @pfiller
    pfiller committed Dec 11, 2012
    Configuration menu
    Copy the full SHA
    c83ec51 View commit details
    Browse the repository at this point in the history

  3. Chosen should only inherit classes from the original select if the us… 

    …er explicitly wants it.
    @pfiller
    pfiller committed Dec 11, 2012
    Configuration menu
    Copy the full SHA
    dc66716 View commit details
    Browse the repository at this point in the history