From 8695d627ea9472fb843778b6f3a3414b732a7131 Mon Sep 17 00:00:00 2001 From: Justin French Date: Wed, 2 Apr 2014 08:02:46 +1100 Subject: [PATCH 1/7] remove donation thing, this is a team effort and no-one donates anyway --- README.textile | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.textile b/README.textile index ddb991469..add06a371 100644 --- a/README.textile +++ b/README.textile @@ -8,8 +8,6 @@ h1. Formtastic Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications. -Click here to lend your support to: formtastic and make a donation at www.pledgie.com ! - h2. Documentation & Support From 22e255fb8392842f0e930517c38b1a95d27cda49 Mon Sep 17 00:00:00 2001 From: Justin French Date: Wed, 2 Apr 2014 08:05:09 +1100 Subject: [PATCH 2/7] cool? --- README.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.textile b/README.textile index add06a371..ac372c9f4 100644 --- a/README.textile +++ b/README.textile @@ -402,7 +402,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the Formtastic::FormBuilder.i18n_lookups_by_default = true -*2. Add some cool label-translations/variants (@config/locales/en.yml@):* +*2. Add some label-translations/variants (@config/locales/en.yml@):* 
   en:

From b9efb213b49d6c005a23dc0cd70cd9563e51b0dd Mon Sep 17 00:00:00 2001
From: Justin French 
Date: Wed, 2 Apr 2014 08:07:45 +1100
Subject: [PATCH 3/7] remove cruft

---
 README.textile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.textile b/README.textile
index ac372c9f4..a6e5b3adb 100644
--- a/README.textile
+++ b/README.textile
@@ -597,10 +597,6 @@ To create a custom @DatePickerInput@ from scratch, put the following in @app/inp
 
 You can use your new input with @:as => :date_picker@.
 
-h3. Don't subclass Formtastic::FormBuilder anymore
-
-It was previously recommended in Formtastic 1.x to subclass Formtastic::FormBuilder to add your own inputs. This is no longer recommended in Formtastic 2, and will not work as expected.
-
 
 h2. Security
 

From 320106e9f636218c97938e1fe0775dfde9983491 Mon Sep 17 00:00:00 2001
From: Justin French 
Date: Wed, 2 Apr 2014 08:08:37 +1100
Subject: [PATCH 4/7] link to new 'official' country select plugin

---
 README.textile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.textile b/README.textile
index a6e5b3adb..045ff4d7f 100644
--- a/README.textile
+++ b/README.textile
@@ -598,18 +598,11 @@ To create a custom @DatePickerInput@ from scratch, put the following in @app/inp
 You can use your new input with @:as => :date_picker@.
 
 
-h2. Security
-
-By default, Formtastic escapes HTML entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
-
-Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
-
-
 h2. Dependencies
 
 There are none other than Rails itself, but...
 
-* If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
+* If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/stefanpenner/country_select (or any other country_select plugin with the same API).
 * There are a bunch of development dependencies
 
 

From 181ef36a8403a8c2a6991b38755e3c378633729b Mon Sep 17 00:00:00 2001
From: Justin French 
Date: Wed, 2 Apr 2014 08:10:49 +1100
Subject: [PATCH 5/7] update contrbution notes to include docs and encourage
 early PRs

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index 045ff4d7f..f2c691a0c 100644
--- a/README.textile
+++ b/README.textile
@@ -603,16 +603,16 @@ h2. Dependencies
 There are none other than Rails itself, but...
 
 * If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/stefanpenner/country_select (or any other country_select plugin with the same API).
-* There are a bunch of development dependencies
+* There are a bunch of development dependencies if you plan to contribute to Formtastic
 
 
 h2. How to contribute
 
 * Fork the project on Github
 * Create a topic branch for your changes
-* Ensure that you provide test coverage for your changes
+* Ensure that you provide *documentation* and *test coverage* for your changes (patches won't be accepted without)
 * Ensure that all tests pass (`bundle exec rake`)
-* Create a pull request on Github
+* Create a pull request on Github (these are also a great place to start a conversation around a patch as early as possible)
 
 
 h2. Project Info

From 6584d8607d1160a31e097e6cc4c2fa2cbc0bba6d Mon Sep 17 00:00:00 2001
From: Justin French 
Date: Wed, 2 Apr 2014 08:11:36 +1100
Subject: [PATCH 6/7] it's now 180

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index f2c691a0c..127095d85 100644
--- a/README.textile
+++ b/README.textile
@@ -617,7 +617,7 @@ h2. How to contribute
 
 h2. Project Info
 
-Formtastic was created by "Justin French":http://www.justinfrench.com with contributions from around 150 awesome developers. Run @git shortlog -n -s@ to see the awesome.
+Formtastic was created by "Justin French":http://www.justinfrench.com with contributions from around 180 awesome developers. Run @git shortlog -n -s@ to see the awesome.
 
 The project is hosted on Github: "http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic, where your contributions, forkings, comments, issues and feedback are greatly welcomed.
 

From 31c91abcd51338044daad5a03a2e55089eea6243 Mon Sep 17 00:00:00 2001
From: Justin French 
Date: Wed, 2 Apr 2014 08:11:52 +1100
Subject: [PATCH 7/7] it's now 2014

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 127095d85..d2343f623 100644
--- a/README.textile
+++ b/README.textile
@@ -621,4 +621,4 @@ Formtastic was created by "Justin French":http://www.justinfrench.com with contr
 
 The project is hosted on Github: "http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic, where your contributions, forkings, comments, issues and feedback are greatly welcomed.
 
-Copyright (c) 2007-2012 Justin French, released under the MIT license.
+Copyright (c) 2007-2014 Justin French, released under the MIT license.