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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide required & disabled functionality #71

Merged
merged 4 commits into from Mar 22, 2016
Merged

Provide required & disabled functionality #71

merged 4 commits into from Mar 22, 2016

Conversation

offirgolan
Copy link
Contributor

I also updated the dev dependencies since tests werent running on my local machine. 馃槃

@simonihmig
Copy link
Contributor

Did the same yesterday already, but did not push yet... :(

Does this include all of #67? So those PRs are mutually exclusive? Did not have time to check in detail...

@offirgolan
Copy link
Contributor Author

It doesnt but I can add it super quick

All credit goes to @	oswaldoacauan
@offirgolan
Copy link
Contributor Author

@simonihmig added disabled functionality. Please give credit to @oswaldoacauan for that.

@oswaldoacauan
Copy link

I will close my PR. Good work @offirgolan 馃憦

@offirgolan offirgolan changed the title Provide required functionality Provide required & disabled functionality Mar 21, 2016
@simonihmig
Copy link
Contributor

@offirgolan regarding my last question: just had a quick glance at it and did not realize the 2 PRs were about two different things (disabled & required), sorry about the confusion! Great that you could merge both into one nevertheless, would have caused merge conflicts everywhere otherwise...

@offirgolan & @oswaldoacauan: thanks for your combined effort, credits will go to both of you of course! :)

simonihmig added a commit that referenced this pull request Mar 22, 2016
feat(FormElement): Provide required & disabled functionality. Thanks to @offirgolan and @oswaldoacauan 

Closes #66
@simonihmig simonihmig merged commit fa66b53 into ember-bootstrap:master Mar 22, 2016
@offirgolan
Copy link
Contributor Author

No worries at all! It was probably faster doing them both together than spending the time to merge 15 files 馃樃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants