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
..
assets	bad display of content types if none + add new gems for tinymce and aloha	2012-01-21 01:48:00 +01:00
cells/locomotive	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
controllers/locomotive	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
helpers/locomotive	fix spelling error in locales	2012-01-25 18:52:54 +11:00
inputs/locomotive	add the ui element to select the languages for a site	2012-01-09 17:24:34 -08:00
mailers/locomotive	refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder)	2012-01-09 06:49:59 -08:00
middlewares/locomotive	stylish buttons in the toolbar	2012-01-17 03:21:30 +01:00
models/locomotive	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
presenters/locomotive	inline editor work in progress	2012-01-17 12:05:39 +01: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	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00