Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 ... Conflicts: app/models/content_instance.rb spec/models/locomotive/content_instance_spec.rb		2011-12-18 01:18:56 +08:00
..
assets	refactoring of the sites picker is done	2011-12-12 10:35:42 +01:00
cells/locomotive	menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip)	2011-11-23 05:01:15 -08:00
controllers/locomotive	refactoring of the import UI is done	2011-12-11 23:33:38 +01:00
helpers/locomotive	Use contents_custom_fields instead of content_custom_fields	2011-12-05 22:29:32 +08:00
inputs/locomotive	refactoring the snippet forms (wip)	2011-12-05 02:31:34 -08:00
mailers/locomotive	wip	2011-11-06 12:18:34 +01:00
models/locomotive	Merge branch 'master' into rails_3_1	2011-12-18 01:18:56 +08:00
presenters/locomotive	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
uploaders/locomotive	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
views/locomotive	refactoring of the sites picker is done	2011-12-12 10:35:42 +01:00