github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
02ea6913e3
engine/app/assets/stylesheets/locomotive/backoffice
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
..
menu API access for the current site + easy way to specify the localization of any controllers + fix a minor bug about adding/removing domains 2012-02-09 11:36:10 +01:00
_box.css.scss refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
_buttons.css.scss first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
application.css.scss Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
codemirror_changes.css.scss refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
content_assets.css.scss simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
datepicker.css.scss date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup 2012-04-26 12:12:55 +02:00
dialog_changes.css.scss date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup 2012-04-26 12:12:55 +02:00
editable_elements.css.scss refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
formtastic_changes.css.css fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip) 2012-02-01 02:01:42 +01:00
formtastic_changes.css.scss back to the original editable_short_text (#349) 2012-04-14 13:38:47 +02:00
layout.css.scss add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements 2012-04-16 11:38:32 +02:00
menu.css first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
sites_picker.css.scss refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00