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
..
models	Merge branch 'master' into wildcards	2012-05-22 20:39:30 -04:00
utils	simple media plugin for Aloha	2012-04-22 01:14:25 +02:00
views	Merge branch 'master' into wildcards	2012-05-22 20:39:30 -04:00
aloha.js.coffee	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
application.js.coffee	Load the locomotive mount path earlier in the JS to make it available for backbone models. Fixes #336	2012-04-06 15:54:54 +08:00
inline_editor.js.coffee	simple media plugin for Aloha	2012-04-22 01:14:25 +02:00
not_logged_in.js.coffee	trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)	2012-01-20 14:46:09 +01:00