Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make activeadmin-mongoid play nice with ActiveRecord Resources #30

Merged
merged 13 commits into from
Jan 8, 2014
Merged

Make activeadmin-mongoid play nice with ActiveRecord Resources #30

merged 13 commits into from
Jan 8, 2014

Commits on Dec 22, 2012

  1. Make activeadmin-mongoid play nice with ActiveRecord resources

    profmaad committed Dec 22, 2012
    Configuration menu
    Copy the full SHA
    a227aa9 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2013

  1. Merge pull request activeadmin#58 from Zhomart/paginator 

    Paginator, fixes activeadmin#57
    @elia
    elia committed Sep 30, 2013
    Configuration menu
    Copy the full SHA
    27ce04f View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2013

  1. Merge pull request activeadmin#61 from Zhomart/paginator 

    Paginator
    @elia
    elia committed Oct 2, 2013
    Configuration menu
    Copy the full SHA
    bba338a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2013

  1. Revert "Better jquery-rails version constrants, thanks to @jarinudom" 

    This reverts commit fffdcfb.
Fixes activeadmin#54
    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    6c6ce94 View commit details
    Browse the repository at this point in the history

  2. Fix specs

    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    3fadfd3 View commit details
    Browse the repository at this point in the history

  3. Lock meta_search version

    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    e5a891f View commit details
    Browse the repository at this point in the history

  4. Survive different entities encondings

    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    de2d1e4 View commit details
    Browse the repository at this point in the history

  5. More encoding fixes

    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    e1d36ce View commit details
    Browse the repository at this point in the history

  6. Remove debugging print 

    [skip ci]
    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    7b971fc View commit details
    Browse the repository at this point in the history

  7. Add status badges to the readme 

    [skip ci]
    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    9d96598 View commit details
    Browse the repository at this point in the history

  8. Bump version

    @elia
    elia committed Oct 5, 2013
    Configuration menu
    Copy the full SHA
    0fb5a35 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2014

  1. Merge branch 'master' of github.com:profmaad/activeadmin-mongoid 

    Conflicts:
	lib/active_admin/mongoid/resource.rb
    profmaad committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    c2547d4 View commit details
    Browse the repository at this point in the history

  2. Make activeadmin-mongoid 0.3.0 play nice with regular activerecord ac… 

    …tiveadmin resources
    profmaad committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    47cae71 View commit details
    Browse the repository at this point in the history