Commit Graph

18 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 7e010e3d47 Code cleanup 80 characters wide [ci skip] 2014-01-08 01:53:00 +01:00
jonatack 3c6817cd83 Code cleanup 80 characters wide [ci skip] 2014-01-08 01:45:42 +01:00
jonatack 8abd7fdd80 Fixes issue #273 - translations for namespaced models.
ActiveRecord uses i18n_key methods which return
"namespace/model_name"("namespace.model_name" in rails 3.0.x) for
Namespace::ModelName. Ransack should used the same pattern.

Adapted from original commit by github.com/Bonias
2014-01-01 18:53:51 +01:00
Jon Atack 82cedfca52 Merge pull request #275 from Bonias/fix-attributes-translations-for-namespaced-models
Fixes issue #273 - translations for namespaced models
2014-01-01 09:41:25 -08:00
jonatack 575003e23f Explicitly define and require dependencies 2013-12-15 19:41:13 +01:00
Tyler Hunt b1a8e020b0 Explicitly define and require dependencies. 2013-12-10 09:00:44 -05:00
Bonias ba6a8fcb18 Fixes issue #273 - translations for namespaced models. ActiveRecord uses i18n_key methods which return "namespace/model_name"("namespace.model_name" in rails 3.0.x) for Namespace::ModelName. Ransack should used the same pattern. 2013-09-05 11:13:03 +02:00
jonatack 5a522b4f4a Add Rails 4 compatibility to master 2013-08-06 19:00:52 +02:00
jonatack 49c1e3134c Use Ruby 1.9 hash syntax 2013-08-04 15:13:41 +02:00
jonatack 596405cef9 Address failing tests 2013-05-23 15:20:48 +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 cec4e3d64f Fix/add specs, remove duplicate base.rb for edge and 3.0 2011-06-04 18:01:12 -04:00
Ernie Miller 294015309b Initial commit. 2011-03-30 20:31:39 -04:00