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
..
assets.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
base.rb	add rspec tests for the import module + debug the cms to handle correctly the default theme	2010-10-29 01:36:45 +02:00
content_types.rb	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-15 00:02:46 +10:30
job.rb	refactoring of the import UI is done	2011-12-11 23:33:38 +01:00
logger.rb	write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook	2011-07-26 21:20:03 +02:00
model.rb	refactoring of the import UI is done	2011-12-11 23:33:38 +01:00
pages.rb	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
site.rb	remove all the references to asset_collections	2011-06-21 06:12:20 -07:00
snippets.rb	removing asset collections	2011-06-17 14:32:54 -07:00