Permalink
Commits on Mar 8, 2012
  1. Merge pull request #1115 from tanraya/master

    gregbell committed Mar 8, 2012
    Fixed: Register print.css in ActiveAdmin::Application instead of initializer
  2. Merge branch '0.4.x-stable'

    gregbell committed Mar 8, 2012
    Conflicts:
    	CHANGELOG.md
  3. Bump version to 0.4.3

    gregbell committed Mar 8, 2012
  4. Updated CHANGELOG for 0.4.3

    gregbell committed Mar 8, 2012
Commits on Mar 7, 2012
  1. Merge pull request #1114 from pcreux/fix-specs-for-1.9.3

    pcreux committed Mar 7, 2012
    Menu::ItemCollection.sort returns an Array on Ruby 1.9.3.
  2. Merge pull request #847 from samvincent/479-filter-scopes

    pcreux committed Mar 7, 2012
    Filters should not clear scoped collection for scope counts
  3. Menu::ItemCollection.sort returns an Array on Ruby 1.9.3.

    pcreux committed Mar 7, 2012
    It returns a Menu::ItemCollection with previous version of Ruby.
    
    I got the specs to by removing the expectation on the type of
    collection returned by #children.
  4. Merge pull request #1110 from mattvague/270_batch_edit_api

    mattvague committed Mar 7, 2012
    Whoopsy, fixed spec
  5. Whoopsy, fixed spec

    mattvague committed Mar 7, 2012
  6. Merge pull request #1082 from tanraya/master

    mattvague committed Mar 7, 2012
    Fixed double rendering of Content-type meta-tag
  7. Merge pull request #921 from mattvague/270_batch_edit_api

    mattvague committed Mar 7, 2012
    270 batch edit api
Commits on Mar 6, 2012
Commits on Mar 2, 2012
  1. Merge pull request #1090 from patizivs/1089-translation-missing-lv-co…

    pcreux committed Mar 2, 2012
    …mments
    
    Comments section translations for latvian language
  2. Merge pull request #1100 from leandromoreira/master

    mattvague committed Mar 2, 2012
    Portuguese Brazilian additions to i18n
  3. Adding more Brazilian Portuguese i18n for comments section.

    Leandro Moreira
    Leandro Moreira committed Mar 2, 2012
Commits on Feb 29, 2012
Commits on Feb 28, 2012
  1. It seems it's a good idea to register built-in active_admin/print.css…

    tanraya committed Feb 28, 2012
    … stylesheet in active_admin.rb initializer.
    
    I moved it out from ActiveAdmin::Views::Pages::Base#build_active_admin_head method.
  2. More naming fixes

    mattvague committed Feb 28, 2012
  3. Merge branch 'master' into 270_batch_edit_api

    mattvague committed Feb 28, 2012
    Conflicts:
    	Gemfile
    	lib/active_admin/namespace.rb
  4. Merge branch 'master' into 270_batch_edit_api

    mattvague committed Feb 28, 2012
    Conflicts:
    	lib/active_admin/locales/en.yml
    	lib/active_admin/view_factory.rb
    	spec/unit/view_factory_spec.rb
Commits on Feb 25, 2012
  1. Completely refactored the menu system to work with i18n

    gregbell committed Feb 24, 2012
    Menu's are now generated on demand using the MenuBuilder instead of
    being created as the resources are registered. MenuItem can now store
    labels as procs, which allows us to properly i18n all the menu labels
    at runtime.
    
    ActiveAdmin::Resource's are now in charge of building their own MenuItem
    objects.
    
    The controller now stores the instance of the currently selected tab in
    @current_tag instead of just a string label.
  2. Revert "Add two pending tests to unit/resource/naming_spec"

    ahx authored and gregbell committed Dec 27, 2011
    This reverts commit 2907c0f.
  3. Fix translation template

    ahx authored and gregbell committed Dec 27, 2011