Permalink
Commits on Jan 19, 2017
  1. Merge pull request #4731 from quikly/4467-namespace-path-options

    make namespace route options configurable
    timoschilling committed on GitHub Jan 19, 2017
  2. Merge pull request #4740 from deivid-rodriguez/maintainance_workflow

    Clarify roles and approvals.
    timoschilling committed on GitHub Jan 19, 2017
  3. Clarify roles and approvals.

    deivid-rodriguez committed Jan 19, 2017
Commits on Jan 18, 2017
  1. Merge pull request #4738 from deivid-rodriguez/maintainance_workflow

    Define workflow for PR merging
    timoschilling committed on GitHub Jan 18, 2017
  2. Define workflow for PR merging

    deivid-rodriguez committed Jan 18, 2017
  3. Merge pull request #4737 from activeadmin/Fivell-patch-1

    fixed typo in /devise/registrations/new.html.erb
    timoschilling committed on GitHub Jan 18, 2017
  4. fixed typo in /devise/registrations/new.html.erb

    Fivell committed on GitHub Jan 18, 2017
Commits on Jan 17, 2017
  1. make namespace route options configurable

    stereoscott committed Jan 16, 2017
  2. Merge pull request #4728 from Fivell/4640_custom_date_range_filter_fix

    fix empty inputs for date_range filters
    timoschilling committed on GitHub Jan 17, 2017
  3. Merge branch 'master' into 4640_custom_date_range_filter_fix

    timoschilling committed on GitHub Jan 17, 2017
  4. Merge pull request #4729 from ypresto/patch-1

    Add doc about Formtastic collection_label_methods
    timoschilling committed on GitHub Jan 17, 2017
Commits on Jan 16, 2017
  1. Add doc about Formtastic collection_label_methods

    ypresto committed Jan 14, 2017
Commits on Jan 14, 2017
  1. fix empty inputs for date_range filters

    before this fix when using ransackers or custom ransackable_scopes
    filters inputs were empty after page reload
    Fivell committed Jan 14, 2017
Commits on Jan 13, 2017
  1. Merge pull request #4726 from koic/update_readme

    Update the README.md
    timoschilling committed on GitHub Jan 13, 2017
  2. Kaminari repository URL has been changed

    koic committed Jan 13, 2017
Commits on Jan 11, 2017
  1. Merge pull request #4717 from deivid-rodriguez/restore_1_9_3_plus_rai…

    …ls_4_0_and_4_1_support
    
    Restore 1.9.3 plus rails 4.0 and 4.1 support
    timoschilling committed on GitHub Jan 11, 2017
  2. Merge branch 'master' into restore_1_9_3_plus_rails_4_0_and_4_1_support

    timoschilling committed on GitHub Jan 11, 2017
  3. Merge pull request #4722 from sue445/kaminari_v1.0.0

    Relax kaminari dependency for kaminari 1.0.0
    timoschilling committed on GitHub Jan 11, 2017
  4. Merge branch 'master' into restore_1_9_3_plus_rails_4_0_and_4_1_support

    timoschilling committed on GitHub Jan 11, 2017
  5. Merge pull request #4721 from varyonic/4710-codecov

    Switch from Coveralls to Codecov.
    timoschilling committed on GitHub Jan 11, 2017
  6. Merge pull request #4705 from varyonic/fix-4533-filter-date-bounds

    Fix #4533, use custom Ransack predicate for datetime, not date columns.
    timoschilling committed on GitHub Jan 11, 2017
  7. Use kaminari 0.x on ruby 1.9

    sue445 committed Jan 11, 2017
  8. Merge branch 'master' into fix-4533-filter-date-bounds

    timoschilling committed on GitHub Jan 11, 2017
  9. Relax kaminari dependency for kaminari 1.0.0

    sue445 committed Jan 11, 2017
Commits on Jan 10, 2017
  1. Switch from Coveralls to Codecov.

    varyonic committed Jan 10, 2017
Commits on Jan 9, 2017
  1. Restore Rails 4.0 and 4.1 entries in Travis

    deivid-rodriguez committed Jan 9, 2017
  2. Fix 1.9.3 dependency constraints

    Otherwise installing deps for the 1.9.3 + Rails 4.0 combo fails with
    
    ```
    json-2.0.2 requires ruby version ~> 2.0, which is incompatible with the
    current version, ruby 1.9.3p551
    ```
    deivid-rodriguez committed Sep 12, 2016
  3. Use latest Rubygems

    Travis with such a big matrix like ours is very likely to expose bugs in
    Rubygems and Bundler.  By using the latest versions, we make sure we
    always get the latest bug fixes from upstream.
    deivid-rodriguez committed Sep 13, 2016
Commits on Jan 6, 2017
  1. Merge pull request #4703 from Fivell/issue_3834

    WIP fixed form behaviour when using has_many with inputs block
    timoschilling committed on GitHub Jan 6, 2017
  2. fixed form behaviour when using has_many with inputs block

    Fivell committed Dec 28, 2016
Commits on Jan 5, 2017
  1. Merge pull request #4648 from PqBenoit/add_number_input_type_to_modal

    Add number input type to modla dialog form (used for batch actions)
    timoschilling committed on GitHub Jan 5, 2017
  2. Merge branch 'master' into fix-4533-filter-date-bounds

    timoschilling committed on GitHub Jan 5, 2017