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
..
content_entry_spec.rb	fix issue #367	2012-04-20 00:31:48 +02:00
current_user.rb	issue #321 (current_user) working. url_helpers removed.	2012-04-21 11:06:13 +02:00
page_spec.rb	refactoring (wip)	2012-04-06 12:23:11 +02:00
site_spec.rb	fix issue #317 + with_scope works now with has_many relationships + clean code	2012-03-12 03:09:20 +01:00