engine/spec/models/locomotive
Marko Iskander 02ea6913e3 Merge branch 'master' into wildcards
Conflicts:
	Gemfile.lock
	app/assets/javascripts/locomotive/models/page.js.coffee
	app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee
	app/models/locomotive/extensions/site/locales.rb
	app/models/locomotive/page.rb
	app/views/locomotive/pages/_form.html.haml
	config/initializers/haml.rb
	config/locales/default.ru.yml
	config/locales/formtastic.ru.yml
	doc/TODO
	lib/locomotive/haml.rb
	script/upgrade_v1.rb
	spec/dummy/config/initializers/haml.rb
2012-05-22 20:39:30 -04:00
..
extensions Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
ability_spec.rb remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc) 2012-01-28 12:41:00 +01:00
account_spec.rb tests pass for the account, content_entry and content_asset models 2012-02-16 12:42:41 +01:00
content_asset_spec.rb tests pass for the account, content_entry and content_asset models 2012-02-16 12:42:41 +01:00
content_entry_spec.rb fix issue #338 2012-04-13 14:38:00 +02:00
content_type_spec.rb fix issue #385 2012-05-07 00:31:59 +02:00
editable_control_spec.rb add missing files for the last commit about the control editable element + implement feature #326 2012-03-22 02:13:24 +01:00
editable_file_spec.rb fixed editable elements (wip) 2012-03-19 02:29:59 +01:00
editable_long_text_spec.rb fixed editable elements (wip) 2012-03-19 02:29:59 +01:00
editable_short_text_spec.rb fix broken tests + make the editing of locales more robust 2012-04-10 04:55:59 -07:00
membership_spec.rb Fixed a bunch of model tests. 2011-11-25 00:37:17 +11:00
page_spec.rb Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
site_spec.rb fix a couple of potential bugs when playing with the site locales 2012-04-13 18:32:55 +02:00
snippet_spec.rb fix broken tests + make the editing of locales more robust 2012-04-10 04:55:59 -07:00
theme_asset_spec.rb Fixed a bunch of model tests. 2011-11-25 00:37:17 +11:00