github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/spec
History
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
..
cells/locomotive fix the specs for the page model 2012-02-16 22:07:00 +01:00
dummy Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
fixtures/assets 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
lib Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
models/locomotive Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
requests all the non-models specs have been fixed 2012-02-16 02:45:14 +01:00
support a little bit of cleaning + prepare the engine to make it work with the hosting extensions 2012-02-18 01:57:06 +01:00
spec_helper.rb performance improvements as described in #383 2012-04-26 03:39:23 +02:00