Merge branch 'master' of git://github.com/gregbell/active_admin

Conflicts:
	app/assets/stylesheets/active_admin/_forms.css.scss
	app/views/active_admin/devise/passwords/new.html.erb
	app/views/active_admin/devise/sessions/new.html.erb
	lib/active_admin/comments/views/active_admin_comments.rb
	lib/active_admin/views/dashboard_section_renderer.rb
	lib/active_admin/views/pages/form.rb

.gitignore

@@ -35,3 +35,16 @@ public
 .rspec
 .rails-version
 .rbenv-version
+*.rbc
+*.sassc
+.sass-cache
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html

.travis.yml

@@ -2,6 +2,11 @@ script: bundle exec rake
 rvm:
   - ree
   - 1.9.2
+  - 1.9.3
 before_install:
   - gem update --system
   - gem --version
+env:
+  - RAILS=3.0.12
+  - RAILS=3.1.4
+  - RAILS=3.2.3

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 * Created new view components (Footer, TitleBar, Header, UtilityNav) to more
   easily customize the views in Active Admin and per namespace. (@gregbell)
+* All CSS is now encapsulated under the `body.active_admin` class. This may
+  change the precedence of styles that you created to override or use in
+  other areas of your application.
 
 ### Deprecations
 
@@ -15,6 +18,13 @@
   creating custom menu items, the builder syntax has changed to. Menu#add now
   accepts a MenuItem, instead of building the menu item for you.
 
+## 0.4.4
+
+### Dependencies
+
+* Use `formtastic` ~> 2.1.1 until AA 0.5.0 is released
+* Use `inherited_resources` >= 1.3.1 (ensure flash messages work)
+
 ## 0.4.3
 
 ### Bug Fixes

CONTRIBUTING.md

@@ -10,10 +10,8 @@ The first step to contributing to Active Admin is creating a ticket in our
 The community has been hard at work already, so please take a second to search
 for the issue or feature before creating a new one.
 
-All features or bug fixes should have a ticket. This makes it easy for everyone
-to discuss the code and know if a fix is already in progress for an issue. If
-it's a feature, the team can prioritize what it should work on based on these
-tickets.
+All bug fixes should have a ticket. This makes it easy for everyone
+to discuss the code and know if a fix is already in progress for an issue.
 
 
 ### 2. Fork & Create a Feature Branch

Gemfile

@@ -26,13 +26,12 @@ group :development, :test do
   gem 'haml',           '~> 3.1.1', :require => false
   gem 'yard'
   gem 'rdiscount' # For yard
-  gem "guard-sprockets"
+  gem "sprockets"
   gem 'rails-i18n' # Gives us default i18n for many languages
 end
 
 group :test do
-  gem 'rspec-rails',    '~> 2.8.1'
-  gem 'cucumber', '1.1.4'
+  gem 'rspec-rails',    '~> 2.9.0'
   gem 'cucumber-rails', '1.2.1', :require => false
   gem 'capybara',       '1.1.2'
   gem 'database_cleaner'

Guardfile

@@ -5,11 +5,3 @@ guard 'rspec', :all_on_start => false, :version => 2 do
   watch(%r{^lib/active_admin/(.+)\.rb$})     { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }
 end
-
-guard 'coffeescript', :output => 'spec/javascripts/compiled', :all_on_start => true  do
-  watch(%r{spec/javascripts/coffeescripts/(.*)\.coffee})
-end
-
-guard 'sprockets', :destination => "app/assets/javascripts/active_admin/", :asset_paths => ['app/assets/javascripts/active_admin/coffeescripts/'] do
-  watch(%r{^app/assets/javascripts/active_admin/coffeescripts/.+$})
-end

README.rdoc

@@ -4,22 +4,17 @@ Active Admin is a framework for creating administration style interfaces. It
 abstracts common business application patterns to make it simple for developers
 to implement beautiful and elegant interfaces with very little effort.
 
-{<img src="https://secure.travis-ci.org/gregbell/active_admin.png" />}[http://travis-ci.org/gregbell/active_admin]
+{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin]
 
 == Documentation & Support
 
 * Documentation & Guides: http://activeadmin.info/documentation.html
 * Wiki: https://github.com/gregbell/active_admin/wiki
-* RDoc: http://rubydoc.info/github/gregbell/active_admin/master/frames
+* RDoc: http://rubydoc.info/gems/activeadmin/frames
 * Live demo: http://demo.activeadmin.info/admin
 * Website: http://www.activeadmin.info
 * <b>Need Support?</b> Ask the Mailing list: http://groups.google.com/group/activeadmin
 
-== Bugs & Feature Requests
-
-* Bug Reports & Feature Requests: https://github.com/gregbell/active_admin/issues
-* Want to Contribute? Read the Guide: https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
-
 == Goals
 
 1. Allow developers to quickly create gorgeous administration interfaces
@@ -28,6 +23,22 @@ to implement beautiful and elegant interfaces with very little effort.
 3. Ensure that developers can easily customize every nook and cranny of the interface.
 4. Build common interfaces as shareable gems so that the entire community benefits.
 
+== Bugs Reports & Contributing
+
+* Bug Reports: https://github.com/gregbell/active_admin/issues
+* Want to Contribute? Read the Guide: https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
+
+== Feature Requests
+
+Please don't put feature requests in Github Issues. They will be closed as soon as they
+are reviewed by one of the core team members. If you would like a feature in Active Admin,
+please submit a well tested pull request with the desired changes. If you're not a coder,
+then the mailing list may be a good place to try to convince someone to help you out
+with your cause.
+
+If you are going to submit a pull request, please read the contributing guide: 
+https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
+
 
 == Getting Started
 

activeadmin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("meta_search", ">= 0.9.2")
   s.add_dependency("devise", ">= 1.1.2")
   s.add_dependency("formtastic", "~> 2.1.1")
-  s.add_dependency("inherited_resources", "<= 1.3.0")
+  s.add_dependency("inherited_resources", ">= 1.3.1")
   s.add_dependency("kaminari", ">= 0.13.0")
   s.add_dependency("sass", ">= 3.1.0")
   s.add_dependency("fastercsv", ">= 0")