Permalink
Commits on Aug 8, 2012
  1. Merge branch 'upstream'

    Conflicts:
    	README.rdoc
    	lib/nested_form/builder_mixin.rb
    	spec/form_spec.rb
    	vendor/assets/javascripts/prototype_nested_form.js
    committed Aug 8, 2012
Commits on Jul 26, 2012
  1. Merge pull request #184 from clemens/master

    Fix the previous pull request
    lest committed Jul 26, 2012
  2. Merge pull request #183 from clemens/master

    Fix: Element.up() is the proper Prototype counter part to jQuery's closest()
    lest committed Jul 26, 2012
  3. Merge pull request #182 from mohelsaka/master

    wrong input field name for clildren
    lest committed Jul 26, 2012
  4. fixing same names issue

    mohelsaka committed Jul 26, 2012
Commits on Jul 16, 2012
  1. Merge pull request #180 from shanab/master

    Fixed typo in README.rdoc
    lest committed Jul 16, 2012
  2. fix typo

    Ahmed Mostafa committed Jul 16, 2012
Commits on Jul 9, 2012
  1. releasing version 0.2.2

    ryanb committed Jul 9, 2012
  2. update CHANGELOG [ci skip]

    lest committed Jul 9, 2012
  3. add .rbx to .gitignore

    lest committed Jul 9, 2012
  4. use openjdk6 on travis

    lest committed Jul 9, 2012
  5. use while instead of #map

    Callbacks array could be modified during #map. This cause errors in
    jruby and rubinius.
    lest committed Jul 9, 2012
Commits on Jul 4, 2012
  1. Revert "Merge pull request #163 from nickhoffman/master"

    This reverts commit 38c7ef3, reversing
    changes made to 63dcbcc.
    lest committed Jul 4, 2012
  2. failing test for #174

    lest committed Jul 4, 2012
Commits on Jun 9, 2012
  1. Merge pull request #169 from nashby/patch-1

    update README
    lest committed Jun 9, 2012
  2. update README

    SimpleForm and Formatastic integration is in a gem now
    nashby committed Jun 9, 2012
  3. Merge pull request #82 from cdemyanovich/contributor_rampup

    Add to README file a 'Questions and Problems' section with instructions on running specs
    lest committed Jun 9, 2012
Commits on Jun 8, 2012
Commits on Jun 6, 2012
  1. Merge pull request #88 from derekprior/patch-1

    readme updates for details on accepts_nested_attributes_for
    lest committed Jun 6, 2012
Commits on Jun 5, 2012
  1. use content_tag helper

    Using content_tag helper helps to avoid manual html generation. It take
    care about html safety.
    lest committed Jun 5, 2012
  2. pass gemfile through the env var

    Use BUNDLE_GEMFILE environment variable instead of --gemfile option when
    invoking `bundle install` in the `spec:install` rake task.
    It helps to avoid weird `Specs already loaded (RuntimeError)` error in
    this rake task.
    lest committed Jun 5, 2012
Commits on Jun 4, 2012
  1. releasing 0.2.1

    ryanb committed Jun 4, 2012
  2. improve test running

    - add rake and bundler to the development dependencies
    - less strict rspec-rails requirement to allow the latest 2.x rspec
      versions
    - use rails 3.2 gemfile as default
    lest committed Jun 4, 2012
  3. split jquery and prototype tests

    It will help to easier find out which javascript version is not working.
    lest committed Jun 4, 2012
Commits on Jun 3, 2012
  1. update CHANGELOG

    Include entries for the current development version (the master branch).
    lest committed Jun 3, 2012
  2. Merge pull request #159 from pellegrino/patch-1

    Tiny typo fixed
    lest committed Jun 3, 2012
  3. remove commented require

    Appraisal was removed in 9101a2f but
    require was commented instead of being removed.
    lest committed Jun 3, 2012
  4. update travis integration

    - change the link to the build status image
    - run tests using xvfb-run instead of running xvfb daemon and setting
      DISPLAY env variable manually
    - test against 1.8.7, 1.9.3, jruby, rubinius
    - configure email notifications
    lest committed Jun 3, 2012
  5. Merge pull request #137 from fxposter/travis

    Added Travis integration
    lest committed Jun 3, 2012
Commits on May 16, 2012
  1. Merge pull request #163 from nickhoffman/master

    Make the "context" selector stricter, to work with deeply-nested forms.
    ryanb committed May 16, 2012
  2. Make the "context" selector stricter, to work with deeply-nested forms.

    99% of the work in this commit came from @groe in this pull request:
    ryanb#78
    nickhoffman committed May 16, 2012