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
..
ability_spec.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_spec.rb	Merge remote-tracking branch 'origin/master' into rails_3_1	2012-01-25 22:16:43 +11:00
content_asset_spec.rb	Some fixes for the content asset spec.	2011-11-20 22:52:20 +11:00
content_entry_spec.rb	Fixed up a bad merge of the content instance spec changes.	2012-01-15 14:50:23 +11:00
content_type_spec.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
editable_element_spec.rb	Specs now run for all models. The account model now passes GREEEEn.	2011-11-20 22:47:41 +11:00
membership_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00
page_spec.rb	Specs now correctly use a multisite test app.	2011-11-25 23:59:44 +11:00
site_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00
snippet_spec.rb	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00
theme_asset_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00