github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
02ea6913e3
engine/app/models/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
..
extensions Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
ability.rb remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc) 2012-01-28 12:41:00 +01:00
account.rb tests pass for the account, content_entry and content_asset models 2012-02-16 12:42:41 +01:00
content_asset.rb use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
content_entry.rb performance improvements as described in #383 2012-04-26 03:39:23 +02:00
content_type.rb fix issue #317 + with_scope works now with has_many relationships + clean code 2012-03-12 03:09:20 +01:00
editable_control.rb add missing files for the last commit about the control editable element + implement feature #326 2012-03-22 02:13:24 +01:00
editable_element.rb new editable element for a page: the control 2012-03-22 00:50:34 +01:00
editable_file.rb new editable element for a page: the control 2012-03-22 00:50:34 +01:00
editable_long_text.rb new editable element for a page: the control 2012-03-22 00:50:34 +01:00
editable_short_text.rb make the editable elements more robust when working with localization + write tests to prove it 2012-03-21 03:21:29 +01:00
membership.rb the screen for editing site has been refactored 2011-11-29 14:58:19 +01:00
page.rb fix issue #346 2012-04-11 00:26:59 +02:00
site.rb Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
snippet.rb page templates were not updated if a related snippet got modified (BUG) 2012-03-02 08:37:54 -08:00
theme_asset.rb fix theme assets tests 2012-02-28 11:25:51 +01:00