github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
02ea6913e3
engine/doc
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
..
changelogs do not mention DelayedJob anymore 2012-02-06 02:44:02 -08:00
locomotive creating page in progress 2010-04-25 02:33:38 +02:00
autotest_setup Add instructions for autotest 2010-07-30 17:28:43 -07:00
feature_list.txt Cucumber / Doc cleanup 2010-08-01 23:32:33 -07:00
NICE_TO_HAVE creating page in progress 2010-04-25 02:33:38 +02:00
PICKLE_STEPS Cleaning up Cucumber features 2010-08-01 03:37:49 -07:00
TODO Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
upgrade_to_rails_3.1.txt convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00