github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b33d081c28
engine/spec
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
..
cells/locomotive Small fix to the global action spec. 2012-01-15 17:05:33 +11:00
dummy trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00
fixtures Fit issue 240 by using slug to find content-type 2012-01-09 15:01:51 +01:00
lib Fixed a failing test (class missing namespace). 2012-01-15 15:05:50 +11:00
models/locomotive Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-25 22:16:43 +11:00
requests Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
support 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
spec_helper.rb Specs now correctly use a multisite test app. 2011-11-25 23:59:44 +11:00