diff --git a/CHANGELOG b/CHANGELOG index 2816afd12e..6813ce4ca0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ += 3.4.0 +- Support rails4 + = 3.3.3 - Allow to override select options in active_scaffold_search_select - Load effects from jQuery UI when using jquery-rails 3 gem diff --git a/README.md b/README.md index 92b7481ff8..b5761d2222 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Overview ======== [![travis tests](https://travis-ci.org/activescaffold/active_scaffold.png)](https://travis-ci.org/activescaffold/active_scaffold) -ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. +ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. Rails 3.2 and 4 are supported. Branch Details -------------- diff --git a/lib/active_scaffold/version.rb b/lib/active_scaffold/version.rb index 2c2dde9a18..5e05a9cf0d 100644 --- a/lib/active_scaffold/version.rb +++ b/lib/active_scaffold/version.rb @@ -2,7 +2,7 @@ module ActiveScaffold module Version MAJOR = 3 MINOR = 3 - PATCH = 3 + PATCH = "4.beta" STRING = [MAJOR, MINOR, PATCH].compact.join('.') end