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
..
base.rb	Revert "Arrays now paginate correctly."	2011-10-24 23:34:43 +08:00
content_entry.rb	fix issue #360	2012-04-19 16:30:16 +02:00
content_types.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
current_user.rb	strange error	2012-04-21 01:50:37 +02:00
page.rb	refactoring (wip)	2012-04-06 12:23:11 +02:00
proxy_collection.rb	introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine	2012-02-17 00:51:33 +01:00
site.rb	remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring	2011-07-04 19:40:14 +02:00
uploader.rb	change the default way to config AWS for carrierwave + fix issue #299	2012-03-02 01:46:02 +01:00