Mario Visic 75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock features/support/env.rb locomotive_cms.gemspec spec/cells/locomotive/global_actions_spec.rb spec/cells/locomotive/main_menu_cell_spec.rb spec/cells/locomotive/settings_menu_cell_spec.rb		2012-01-14 16:37:24 +10:30
..
httparty	fix issue #91	2011-06-22 15:57:24 -07:00
liquid	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-14 16:37:24 +10:30
routing	Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests.	2011-12-06 21:42:41 +08:00
configuration_spec.rb	fix bug #111	2011-07-09 00:47:05 +02:00
export_spec.rb	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
import_spec.rb	listing all entries (done) + fix bugs + tweak ui	2012-01-04 02:07:53 +01:00
render_spec.rb	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