Permalink
Commits on Feb 21, 2012
  1. @pcreux
  2. @gregbell

    Bumped version to 0.4.2

    gregbell committed Feb 21, 2012
  3. @gregbell

    Updated CHANGELOG for 0.4.2

    gregbell committed Feb 21, 2012
Commits on Feb 20, 2012
  1. @pcreux

    Merge pull request #1053 from dlepage/master

    fr.yml updated.
    pcreux committed Feb 20, 2012
  2. @dlepage

    Update fr.yml

    dlepage committed Feb 20, 2012
  3. @pcreux

    Merge pull request #1050 from jancel/34_comment_models_string_ids

    add compatibility for comments with model ids that are strings Closes #34
    pcreux committed Feb 20, 2012
  4. @jancel
Commits on Feb 19, 2012
  1. @pcreux
  2. @pcreux

    Merge pull request #822 from bvision/master

    Add active_admin assets to precompile list in engine
    pcreux committed Feb 19, 2012
  3. @pcreux

    Merge pull request #1045 from jancel/1043_cucumber_patch_temporary

    Use cucumber 1.1.4. Features are failing with 1.1.5.
    pcreux committed Feb 19, 2012
  4. @jancel
Commits on Feb 18, 2012
  1. @gregbell
  2. @gregbell

    Merge pull request #1042 from latortuga/master

    Fix the dependency check for pry-rails
    gregbell committed Feb 18, 2012
  3. @latortuga

    Fix the logic for pry-rails dependency checking

    The check was just backwards so I made the name of the method more explicit
    and changed the if to an unless.
    latortuga committed Feb 18, 2012
  4. @gregbell

    Merge pull request #1033 from gregbell/render-or-method-or-exec

    site_title accepts String, Symbol or Proc
    gregbell committed Feb 18, 2012
  5. @gregbell

    Merge pull request #1041 from jancel/1016_arbre_skip_blank_tags

    1016 arbre skip blank tags
    gregbell committed Feb 18, 2012
  6. @pcreux
  7. @jancel
  8. @gregbell
  9. @gregbell

    Issue #70 - Form blocks are now eval'd in the context of the view

    You can now do:
    
        ActiveAdmin.register Post do
          form do
            if current_admin_user.super_admin?
              f.inputs "For Super Admins", :super_admin_thing
            end
            f.buttons
          end
        end
    gregbell committed Feb 18, 2012
  10. @gregbell

    Eval filter's collections in the context of the view. Issue #70

    When defining a filter, you can pass a collection that will be
    rendered within the context of the view. For example:
    
    ActiveAdmin.register Post do
      filter :some_attr, :as => :select,
                         :collection => proc{ current_admin_user.some_collection }
    end
    gregbell committed Feb 18, 2012
  11. @pcreux
  12. @jancel
  13. @mattvague

    Merge pull request #1039 from mattvague/docs

    Add associated objects display methods to docs
    mattvague committed Feb 18, 2012
  14. @mattvague
  15. @gregbell
  16. @pcreux

    Renamed the comments resource

    Moritz Behr committed with pcreux Feb 16, 2012
  17. @pcreux

    Renamed the comments title

    Moritz Behr committed with pcreux Feb 16, 2012
  18. @pcreux

    Added ability to use localization in the comments section

    Moritz Behr committed with pcreux Feb 16, 2012
  19. @pcreux

    Merge pull request #1036 from thbar/941-link-to-wiki-from-documentation

    Add a link to the wiki (closes #941)
    pcreux committed Feb 18, 2012
  20. @thbar

    Add a link to the wiki

    thbar committed Feb 18, 2012
Commits on Feb 17, 2012
  1. @pcreux

    Fix locale zh-TW.

    pcreux committed Feb 17, 2012
  2. @pcreux

    Merge pull request #1031 from allenhuang/1028-add_traditional_chinese…

    …_translation_for_taiwan
    
        Add zh-TW locale for Taiwan Traditional Chinese
    pcreux committed Feb 17, 2012
  3. @pcreux

    Make #site_title proc friendly

    pcreux committed Feb 17, 2012
  4. @pcreux

    Add render_or_call_method_or_proc method.

    I'd love to find a better name for it.
    pcreux committed Feb 17, 2012