Permalink
Commits on Mar 21, 2014
  1. Fix the wrapper_mappings documentation [ci skip]

    rafaelfranca committed Mar 21, 2014
    Conflicts:
    	lib/simple_form.rb
Commits on Mar 17, 2014
  1. Merge pull request #985 from scouttyg/master

    rafaelfranca committed Mar 17, 2014
    Fix Simple Form Foundation generator to use correct class with error
    Conflicts:
    	lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb
Commits on Mar 12, 2014
  1. Merge pull request #999 from plataformatec/rm-boolean-label-class

    rafaelfranca committed Mar 12, 2014
    Add boolean_label_class config
    Conflicts:
    	CHANGELOG.md
    	lib/simple_form/inputs/boolean_input.rb
Commits on Jan 4, 2014
  1. collection input that uses automatic collection translation properly …

    nashby committed Dec 31, 2013
    …sets checked values
    
    
    closes #971
Commits on Nov 29, 2013
  1. use old hash syntax in tests

    nashby committed Nov 29, 2013
  2. use old hash syntax in tests

    nashby committed Nov 29, 2013
  3. input_field uses the same wrapper as input but only with attribute co…

    nashby committed Nov 24, 2013
    …mponents
    
    
    closes #938 #823
    
    Conflicts:
    
    	lib/simple_form/form_builder.rb
  4. Merge branch '2-1-1' into v2.2

    rafaelfranca committed Nov 29, 2013
    Conflicts:
    	CHANGELOG.md
  5. Release 2.1.1

    rafaelfranca committed Nov 29, 2013
  6. Make sure error_prefix option is escaped if it is not safe

    rafaelfranca committed Nov 27, 2013
    Signed-off-by: Rafael Mendonça França <rafaelmfranca@gmail.com>
  7. Make sure hint text is escaped if it is not safe

    rafaelfranca committed Nov 27, 2013
    Signed-off-by: Rafael Mendonça França <rafaelmfranca@gmail.com>
  8. Make sure label text is escaped if it is not safe

    rafaelfranca committed Nov 26, 2013
    Signed-off-by: Rafael Mendonça França <rafaelmfranca@gmail.com>
Commits on Nov 26, 2013
  1. Allow not including input wrapper class

    Luiz HD Costa
    Luiz HD Costa committed Nov 12, 2013
    There could be faulty behavior when setting checkbox or radio class
    to the input wrapper, as in Bootstrap 3.
    
    Fixes #930
    
    Conflicts:
    	CHANGELOG.md
  2. Use Ruby 1.8 syntax

    rafaelfranca committed Nov 26, 2013
  3. Merge pull request #934 from rcillo/add-form-wrapper

    rcillo authored and rafaelfranca committed Nov 12, 2013
    Add wrapper mapping per form basis.
    Conflicts:
    	CHANGELOG.md
    	lib/simple_form.rb
  4. Merge pull request #932 from plataformatec/lc-neutral-defaults-from-b…

    Luiz H. D. Costa authored and rafaelfranca committed Nov 12, 2013
    …ase-generator
    
    Use neutral defaults in generators
    Conflicts:
    	lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb
  5. Update Bootstrap references URLs and name

    lucasmazza authored and rafaelfranca committed Nov 8, 2013
    For what is worth we are still supporting v2, so its worth to
    keep this up to date.
    
    Closes #925.
    
    Conflicts:
    	README.md
    	lib/generators/simple_form/install_generator.rb
  6. collection input generates `required` attribute if it has `prompt` op…

    nashby authored and rafaelfranca committed Nov 3, 2013
    …tion
    
    
    closes #919
    
    Conflicts:
    	CHANGELOG.md
  7. Merge pull request #911 from deivid-rodriguez/fix_table_in_readme

    rafaelfranca committed Oct 16, 2013
    Fix table in README to actually render beautifully
    Conflicts:
    	README.md
  8. Merge pull request #877 from deivid-rodriguez/improve_readme

    rafaelfranca committed Oct 16, 2013
    Improve readme
    Conflicts:
    	README.md
  9. Merge pull request #893 from morenoh149/master

    rafaelfranca committed Sep 25, 2013
    Added a note on custom inputs
Commits on Nov 11, 2013
  1. Merge pull request #906 from cristi-badila/v2.1

    rafaelfranca committed Nov 11, 2013
    Backport of fix for #316 - Add configuration to add class globally to inputs.
Commits on Oct 8, 2013
  1. Add configuration to add class globally to inputs.

    rafaelfranca authored and cristi-badila committed Sep 27, 2011
    Closes #316
    
    Conflicts:
    
    	lib/simple_form.rb
Commits on Sep 24, 2013
  1. update CHANGELOG [ci skip]

    nashby committed Sep 24, 2013
  2. Merge pull request #892 from angelic/collection_check_boxes_with_name

    nashby committed Sep 24, 2013
    Collection check boxes with name
Commits on Jun 29, 2013
Commits on Jun 20, 2013
Commits on May 20, 2013
  1. add html5 component support to input_field

    nashby committed May 16, 2013
    closes #802
    
    Conflicts:
    	CHANGELOG.md
    	lib/simple_form/form_builder.rb
Commits on Feb 26, 2013
  1. use mocha ~> 0.12.0

    nashby committed Feb 26, 2013
  2. Update CHANGELOG.md

    nashby committed Feb 26, 2013
  3. Release 2.1.0

    rafaelfranca committed Feb 26, 2013