Mario Visic 840609cbce Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock app/cells/locomotive/menu_cell.rb app/helpers/admin/content_types_helper.rb app/models/content_instance.rb app/models/page.rb app/views/admin/shared/menu/_contents.html.haml config/initializers/locomotive.rb config/locales/admin_ui.de.yml config/locales/admin_ui.en.yml config/locales/admin_ui.es.yml config/locales/admin_ui.fr.yml config/locales/admin_ui.it.yml config/locales/admin_ui.nl.yml config/locales/admin_ui.no.yml config/locales/admin_ui.pt-BR.yml config/locales/admin_ui.ru.yml lib/generators/locomotive/install/templates/locomotive.rb lib/locomotive/configuration.rb locomotive_cms.gemspec spec/models/locomotive/account_spec.rb		2012-01-25 22:16:43 +11:00
..
actions	make the edition of content types more robust (ex: better errors handler)	2012-01-18 01:43:01 +01:00
menu	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
_footer.html.haml	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
_form_actions.html.haml	use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip)	2011-11-09 02:35:59 +01:00
_head.html.haml	use the right path to the back-office in the js components as well as in the middlewares	2012-01-14 14:54:01 +01:00
_header.html.haml	implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss	2012-01-14 01:38:09 +01:00
_locale_picker_link.html.haml	refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow)	2012-01-17 17:04:45 +01:00