Permalink
Commits on Jun 3, 2011
  1. Merge branch 'master' into fabiokr/master

    gregbell committed Jun 3, 2011
    Conflicts:
    	README.rdoc
    	lib/active_admin/resource_controller.rb
    	lib/active_admin/views/components/paginated_collection.rb
    	lib/active_admin/views/index_as_table.rb
Commits on Jun 2, 2011
  1. Merge pull request #144 from Pensco/member_link_style

    gregbell committed Jun 2, 2011
    Use .member_link rather than individual classes for styling member action
  2. Merge pull request #147 from nahurst/dashboard_render_comment_fix

    gregbell committed Jun 2, 2011
    wrapping the render comment in the dashbard template with a div
  3. Don't override _prefix anymore, instead override each controller action

    gregbell committed Jun 2, 2011
    * _prefix caused a bunch of issues when rendering templates
    * All InheritedResources functionality is now available within
      ActiveAdmin::ResourceController instances
    * Cukes are currently testing all functionality. Could probably add
      specs to this at some point to ensure that a future version of
      Inherited Resources doesn't break expected functionality
Commits on Jun 1, 2011
  1. Merge pull request #141 from pcreux/csv-config

    gregbell committed Jun 1, 2011
    Fix bug. CSV output is now html_safe.
  2. Merge remote branch 'mwindwer/kaminari'

    gregbell committed Jun 1, 2011
    Conflicts:
    	Gemfile
    	activeadmin.gemspec
Commits on May 31, 2011
  1. Revert "Added I18n for table headers"

    fabiokr committed May 31, 2011
    This reverts commit 6ace5a7.
  2. Merge pull request #138 from pcreux/csv-config

    gregbell committed May 31, 2011
    Make CSV format customizable
  3. CSV is now customizable

    pcreux committed May 25, 2011
  4. update readme with kaminari

    damrbaby committed May 31, 2011
  5. paginate with kaminari

    damrbaby committed May 31, 2011
  6. Got initial cuke passing

    gregbell committed with pcreux May 20, 2011
  7. Revert "Experimental support for CanCan"

    pcreux committed May 31, 2011
    This reverts commit 32d522b.
  8. Experimental support for CanCan

    gregbell committed May 31, 2011
  9. Regenerated Gemspec

    gregbell committed May 31, 2011
  10. Removed dependency on InheritedViews. Now uses InheritedResources::Base.

    gregbell committed May 31, 2011
    * This removes a bunch of unsupported functionality that is provided
      in InheritedViews.
    * Speeds up action rendering because we don't have to wait for an
      exception to be raised on each action.
    * Brings rendering logic into Active Admin which will make it easier for
      the upgrade to Rails 3.1
    * Reduces the number of dependencies... which is always good.
  11. Merge pull request #130 from pcreux/master

    gregbell committed May 31, 2011
    Remove a call to #p that makes my terminal look like the matrix.
  12. I18n for the show page

    fabiokr committed May 31, 2011
Commits on May 30, 2011
  1. Remove call to #p.

    pcreux committed May 30, 2011
  2. Added I18n for table headers

    fabiokr committed May 30, 2011
Commits on May 29, 2011