github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
02ea6913e3
engine/app/assets/stylesheets/locomotive
History
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
..
backoffice Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
inline_editor Update app/assets/stylesheets/locomotive/inline_editor/layout.css.scss 2012-03-23 16:53:42 +01:00
not_logged_in fix errors when deploying a new brand new engine instance 2012-01-27 02:27:26 +01:00
shared simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
inline_editor.css simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
not_logged_in.css trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00