github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
wildcards
engine/spec/dummy/config
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
..
environments namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
initializers Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
locales 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
application.rb fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip) 2012-02-01 02:01:42 +01:00
boot.rb Merge branch 'master' into rails_3_1 2011-12-15 22:29:07 +08:00
environment.rb namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
mongoid.yml performance improvements as described in #383 2012-04-26 03:39:23 +02:00
routes.rb polish again the content_locale picker 2012-01-14 13:12:44 +01:00