Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: app/models/content_instance.rb config/locales/admin_ui.de.yml public/javascripts/admin/inline_editor_toolbar.js spec/models/content_instance_spec.rb		2012-01-15 00:02:46 +10:30
..
cells/locomotive	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-14 16:37:24 +10:30
dummy	add the ui element to select the languages for a site	2012-01-09 17:24:34 -08:00
fixtures	Fit issue 240 by using slug to find content-type	2012-01-09 15:01:51 +01:00
lib	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-14 16:37:24 +10:30
models	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-15 00:02:46 +10:30
requests	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00
support	content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API	2011-12-23 00:45:32 +01:00
spec_helper.rb	Specs now correctly use a multisite test app.	2011-11-25 23:59:44 +11:00