Move v2.0.0-wip into master. #38

Merged
merged 67 commits into from Sep 5, 2012

Conversation

Projects
None yet
2 participants
@mjbellantoni
Owner

mjbellantoni commented Sep 5, 2012

Move the v2.0.0 work in progress into the master branch. This adds support for Rails 3.2.x, Formtastic 2.x and Bootstrap 2.1.x.

This is essentially a beta release.

mjbellantoni added some commits Apr 14, 2012

Use as much of Formtastic's testing support as possible. Removed file…
…s that had been copied

and removed now-undeeded code from Formtastic Bootstrap's support directory.
Update FB's copy of custom_macros to the version appearing in Formtas…
…tic v2.2. This

was done mechanically by applying a diff.
Use a new version of Formtastic's custom_macros.rb and begin back-
porting changes.  Began with changes needed for BooleanInput.
Add support for DateSelectInput. Some other house cleaning comes
in with this.  (I'll try to make the commits tidier from here on
out.)
@kristianmandrup

This comment has been minimized.

Show comment Hide comment
@kristianmandrup

kristianmandrup Sep 4, 2012

Are you targeting Twitter Bootstrap 2.0.4 or 2.1? How far are you from the next release? The version I hacked together doesn't work well with TS 2.1 unfortunately :(

Are you targeting Twitter Bootstrap 2.0.4 or 2.1? How far are you from the next release? The version I hacked together doesn't work well with TS 2.1 unfortunately :(

mjbellantoni added a commit that referenced this pull request Sep 5, 2012

@mjbellantoni mjbellantoni merged commit 9a0be55 into master Sep 5, 2012

nbrew pushed a commit to nbrew/formtastic-bootstrap that referenced this pull request Apr 19, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment