github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
840609cbce
engine/app/cells/locomotive
History
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
..
content_locale_picker 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
global_actions namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
main_menu menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip) 2011-11-23 05:01:15 -08:00
menu namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
sub_menu namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
content_locale_picker_cell.rb polish again the content_locale picker 2012-01-14 13:12:44 +01:00
global_actions_cell.rb trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00
main_menu_cell.rb isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
menu_cell.rb Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-25 22:16:43 +11:00
settings_menu_cell.rb isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
sub_menu_cell.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00