github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
840609cbce
engine/app/models/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
..
extensions 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
ability.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
account.rb done (for now) with the my account screen 2011-12-02 01:43:49 +01:00
content_asset.rb 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
content_entry.rb Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-25 22:16:43 +11:00
content_type.rb make the edition of content types more robust (ex: better errors handler) 2012-01-18 01:43:01 +01:00
editable_element.rb fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
editable_file.rb refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
editable_long_text.rb refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
editable_short_text.rb refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
membership.rb the screen for editing site has been refactored 2011-11-29 14:58:19 +01:00
page.rb Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-25 22:16:43 +11:00
site.rb Fixed up a failing test due to the i18n module, left a fixme note. 2012-01-15 15:05:31 +11:00
snippet.rb fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
theme_asset.rb theme assets page in progress 2011-12-07 02:09:13 +01:00