Commit Graph

20 Commits

Author SHA1 Message Date
Washington Luiz b4973315e9 Merge branch 'master' into bring-rails-3
Conflicts:
	.travis.yml
	Gemfile
	README.md
	lib/ransack/adapters/active_record/3.0/context.rb
	lib/ransack/adapters/active_record/3.1/context.rb
	lib/ransack/adapters/active_record/3.2/context.rb
	lib/ransack/adapters/active_record/base.rb
	lib/ransack/adapters/active_record/context.rb
	lib/ransack/constants.rb
	lib/ransack/context.rb
	lib/ransack/helpers/form_builder.rb
	lib/ransack/helpers/form_helper.rb
	lib/ransack/nodes/attribute.rb
	lib/ransack/nodes/condition.rb
	lib/ransack/nodes/grouping.rb
	lib/ransack/nodes/sort.rb
	lib/ransack/predicate.rb
	lib/ransack/translate.rb
	ransack.gemspec
	spec/blueprints/people.rb
	spec/ransack/adapters/active_record/base_spec.rb
	spec/ransack/adapters/active_record/context_spec.rb
	spec/ransack/configuration_spec.rb
	spec/ransack/dependencies_spec.rb
	spec/ransack/helpers/form_builder_spec.rb
	spec/ransack/helpers/form_helper_spec.rb
	spec/ransack/predicate_spec.rb
	spec/ransack/search_spec.rb
	spec/ransack/translate_spec.rb
	spec/support/schema.rb
2014-04-10 00:28:29 -03:00
jonatack 1e24b60906 Code cleanup 2013-12-15 13:30:27 +01:00
jonatack 43fe25c85e Remove unneeded arg from form_builder_spec.rb 2013-12-10 19:34:47 +01:00
jonatack 180ec8f7e3 Refactor options order in form_builder methods 2013-12-08 21:47:46 +01:00
jonatack 914a0d7a13 Refactor form_builder 2013-12-07 23:17:17 +01:00
jonatack a128557828 Refactor lib/ransack/helpers/form_builder.rb
and code cleanup
2013-12-07 22:48:51 +01:00
Denis Tataurov f491cb2ad0 Fix issue where trying to add a polymorphic field in search form resulted in NameError
Fixes #159
Fixes #313
2013-12-05 09:52:04 +11:00
Denis Tataurov 37dbebc579 Fix issue where trying to add a polymorphic field in search form resulted in NameError
Fixes #159
Fixes #313
2013-12-05 09:51:42 +11:00
jonatack fc5fbcf8b4 Tests: more AR versioning and update routes for Rails 3 + 4 2013-08-06 18:56:16 +02:00
jonatack 49c1e3134c Use Ruby 1.9 hash syntax 2013-08-04 15:13:41 +02:00
jonatack e13853b2cf Merge spectator's escape brackets commit for Rails 3-0-stable
It seems that rails 3-0-stable doesn't escape these elements in the
URL, whereas later versions of Rails do.
2013-05-25 01:05:39 +02:00
jonatack f536007960 Merge pull request #213 from piton/translate-common-attributes
I18n common attributes and Translate.attribute_name
2013-05-23 14:56:48 +02:00
Andrew Vit 9b9fd09915 Fix errors and warnings with specs on rails 4.0 2013-04-08 09:10:53 +10:00
Anatoliy Pronin 08c375d4b0 changed the translation of common attributes 2013-03-17 02:34:07 +04:00
Ernie Miller f6973b3a3b Initial work on sort_link. Mostly ported from MetaSearch, changes coming soon 2011-08-13 16:36:40 -04:00
Ernie Miller e5c7d8be2b DRY up predicate detection, add some starter docs 2011-06-06 21:32:03 -04:00
Ernie Miller 1c41a3ea2c Add :only/:compound options to predicate_select, refactor ands/ors -> groupings 2011-06-05 14:29:54 -04:00
Ernie Miller cec4e3d64f Fix/add specs, remove duplicate base.rb for edge and 3.0 2011-06-04 18:01:12 -04:00
Ernie Miller 742c638af6 3.0 backporting work in progress 2011-04-18 11:28:19 -04:00
Ernie Miller 294015309b Initial commit. 2011-03-30 20:31:39 -04:00