Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Sync with 1.0.0 release - Merge branch 'master' into rails3

  • Loading branch information...
commit 42b4eb8c98082765d249d1c0b3619a77582a99d1 2 parents 3dbe0fd + 7f0bc84
@yabawock yabawock authored
Showing with 11 additions and 13 deletions.
  1. +4 −0 CHANGELOG
  2. +3 −9 README.textile
  3. +1 −1  VERSION.yml
  4. +3 −3 formtastic.gemspec
View
4 CHANGELOG
@@ -10,6 +10,10 @@
* Added compatible install and form helpers (rails3)
* Added support for ActiveModel Validations, thanks to Guillaume Belleguic (rails3)
+1.0.0
+
+* nothing changed from rc2
+
1.0.0.rc2
* Fixed that :label=>false didn't disable the label on checkboxes/radiobuttons (#331)
View
12 README.textile
@@ -79,7 +79,7 @@ RDoc documentation _should_ be automatically generated after each commit and mad
h2. A Note About Rails 3 Support
-Formtastic 1.0 will only support the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release soon after 1.0, around the same time Rails 3.0 ships.
+Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
If you have a Rails 3 project and would like to use Formtastic's rails3 branch, bundler provides you with the ability to do this easily. Just add Formtastic as a git dependency in your Gemfile with the :branch option:
@@ -98,12 +98,6 @@ Install the Formtastic gem:
sudo gem install formtastic
</pre>
-Or try the 1.0.0.beta2:
-
-<pre>
- sudo gem install formtastic --pre
-</pre>
-
And add it to your environment.rb configuration as a gem dependency:
<pre>
@@ -540,7 +534,7 @@ Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
h2. Focus
-Formtastic is close to shipping a 1.0 release candidate after more than a year of active development. 1.0 will be compatible with Rails 2, and this is our top priority right now. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 ships.
+Formtastic 1.0 is compatible with Rails 2.x *only*. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 final ships.
There's heaps more we want to do, but we have to do this first.
@@ -558,7 +552,7 @@ h2. Compatibility
* We're only testing Formtastic with the latest Rails 2.x stable release. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
* Development of a Rails 2 *and* 3 compatible version of Formtastic is underway in the rails3 branch, targeting a Formtastic 1.1 release shortly after Rails 3.0 ships.
-* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now. Shipping a solid 1.0 and Rails 3 compatible 1.1 is.
+* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now.
h2. How to contribute
View
2  VERSION.yml
@@ -2,4 +2,4 @@
:major: 1
:minor: 0
:patch: 0
-:build: rc2
+:build:
View
6 formtastic.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{formtastic}
- s.version = "1.0.0.rc2"
+ s.version = "1.0.0"
- s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Justin French"]
- s.date = %q{2010-08-09}
+ s.date = %q{2010-08-12}
s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
s.email = %q{justin@indent.com.au}
s.extra_rdoc_files = [
Please sign in to comment.
Something went wrong with that request. Please try again.