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.rb	fix issue #367	2012-04-20 00:31:48 +02:00
fullpath.rb	handle is unique within the scope of a site	2012-04-11 00:21:20 +02:00
listed.rb	nested templatized pages finally done (+ specs) + upgrade gems + change the zindex value of the start button for the inline editor + change version (rc.3) for the next rc release	2012-03-28 00:26:32 +02:00
parse.rb	wip	2012-04-05 17:12:26 +02:00
redirect.rb	alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)	2012-02-20 01:15:43 +01:00
render.rb	refactoring (wip)	2012-04-06 12:23:11 +02:00
templatized.rb	wip	2012-04-05 17:12:26 +02:00
tree.rb	Merge branch 'master' into wildcards	2012-05-22 20:39:30 -04:00