github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/config/initializers
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
..
devise.rb use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
formtastic.rb add the UI for the belongs_to custom field 2012-01-31 01:50:09 +01:00
haml.rb Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
locomotive_loaded_first.rb get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code 2012-02-06 00:54:09 +01:00