Permalink
Commits on Sep 6, 2011
  1. Merge pull request #159 from alsemyonov/master

    Do not depend on Rails because it depends on ActiveRecord, whenever you use it or another ORM/ODM in application
    amatsuda committed Sep 6, 2011
Commits on Sep 4, 2011
  1. Depend on Railties instead of Rails (fixed autodepending on ActiveRec…

    …ord if application uses another ORM)
    alsemyonov committed Sep 4, 2011
Commits on Aug 29, 2011
  1. Merge branch 'datamapper-int' of https://github.com/Ragmaanir/kaminari

    …into Ragmaanir-datamapper-int
    
    Conflicts:
    	kaminari.gemspec
    	lib/kaminari/models/data_mapper_extension.rb
    	lib/kaminari/railtie.rb
    	spec/models/data_mapper_spec.rb
    
    also, refactored a lot to make the code simple
    amatsuda committed Aug 29, 2011
  2. Merge branch 'master' of git://github.com/NoICE/kaminari

    Conflicts:
    	lib/kaminari/models/active_record_extension.rb
    	lib/kaminari/railtie.rb
    amatsuda committed Aug 29, 2011
  3. Merge branch 'mongoid_embedded_docs' of https://github.com/yuki24/kam…

    …inari into yuki24-mongoid_embedded_docs
    amatsuda committed Aug 29, 2011
Commits on Aug 25, 2011
  1. be paginatable if both limit and offset are given when initializing

    don't have to call offset() to be paginatable
    amatsuda committed Aug 25, 2011
  2. API change for PaginatableArray.new

    using options hash instead of three nullable arguments
    amatsuda committed Aug 24, 2011
Commits on Aug 24, 2011
  1. Merge branch 'patch-1' of https://github.com/samdalton/kaminari into …

    …samdalton-patch-1
    
    Conflicts:
    	lib/kaminari/models/array_extension.rb
    amatsuda committed Aug 24, 2011
Commits on Aug 21, 2011
  1. spec for model inheritance

    amatsuda committed Aug 21, 2011
  2. Merge branch 'master' of https://github.com/Casecommons/kaminari

    Conflicts:
    	lib/kaminari/models/active_record_extension.rb
    	spec/models/scopes_spec.rb
    amatsuda committed Aug 21, 2011
  3. Merge pull request #108 from seejohnrun/master

    Inheritance
    amatsuda committed Aug 21, 2011
Commits on Aug 20, 2011
  1. load mongo_mapper via load_hook

    amatsuda committed Aug 15, 2011
  2. Revert "add current_page to PaginatableArray"

    This partially reverts commit 7532ecc.
    amatsuda committed Aug 20, 2011
  3. rename Relation#skip to shift

    bacause this method name overlaps with MongoDB's skip() function
    amatsuda committed Aug 15, 2011
Commits on Aug 17, 2011
  1. Adding skip method to skip an arbitrary record count

    Can be used in conjunction with page and per to offset by an
    amount less than the page size.
    aaronjensen committed with amatsuda Mar 14, 2011
Commits on Aug 14, 2011
Commits on Aug 13, 2011
Commits on Jul 25, 2011
  1. Added a param to allow setting of the total count of documents to pag…

    …inate through. Useful for when working with RSolr.
    samdalton committed Jul 25, 2011
Commits on Jul 2, 2011
  1. Merge pull request #134 from sethvargo/master

    Added documentation for generating friendly URLs
    amatsuda committed Jul 2, 2011
Commits on Jul 1, 2011
Commits on Jun 16, 2011
  1. typo

    amatsuda committed Jun 16, 2011
Commits on Jun 8, 2011
Commits on May 23, 2011
  1. - basic dm pagination working

    Ragmaanir committed May 23, 2011
Commits on May 20, 2011
  1. Active Record models that were subclassed before Kaminari::ActiveReco…

    …rdExtension is included pick up the extensions.
    Grant Hutchins & Sam Obukwelu committed May 20, 2011
Commits on May 10, 2011
Commits on May 9, 2011
  1. Ensure that ORDER BY clauses from default scopes are not included in …

    …total_count queries in AR 3.1.beta1
    
    see: rails/rails#406
    amatsuda committed May 9, 2011
Commits on May 6, 2011
  1. Merge pull request #107 from Florent2/patch-1

    Fix misc typo in README.rdoc
    amatsuda committed May 6, 2011