github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/app/views/locomotive/pages
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
..
_editable_elements.html.haml new editable element for a page: the control 2012-03-22 00:50:34 +01:00
_form.html.haml Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
_page.html.haml refactoring (wip) 2012-04-06 12:23:11 +02:00
edit.html.haml polishing the current site editing screen (wip) 2011-11-29 02:24:02 +01:00
index.html.haml fix the annoying bug of duplicated flash messages + first backbone view for the index pages section 2011-11-10 13:29:59 +01:00
new.html.haml fix module collisions and missing namespaces all over the templates (wip) 2011-11-08 01:11:15 +01:00