github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/lib/locomotive/action_controller
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
..
locale_helpers.rb templatized page can now use models from the main app + add new liquid filters 2012-02-10 00:57:57 +01:00
public_responder.rb refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder) 2012-01-09 06:49:59 -08:00
responder.rb was breaking the API (tests are coming) 2012-04-17 13:53:15 +02:00
section_helpers.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
url_helpers.rb fix broken tests + make the editing of locales more robust 2012-04-10 04:55:59 -07:00