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
..
app	the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office	2012-04-22 23:25:18 +02:00
config	Merge branch 'master' into wildcards	2012-05-22 20:39:30 -04:00
lib/assets	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
log	fix module collisions and missing namespaces all over the templates (wip)	2011-11-08 01:11:15 +01:00
public	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
script	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
config.ru	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00
Rakefile	namespace controllers, models, ...etc (wip)	2011-10-31 00:02:41 +01:00