Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 ... Conflicts: app/models/content_instance.rb spec/models/locomotive/content_instance_spec.rb		2011-12-18 01:18:56 +08:00
..
extensions	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00
ability.rb	Specs now run for all models. The account model now passes GREEEEn.	2011-11-20 22:47:41 +11:00
account.rb	done (for now) with the my account screen	2011-12-02 01:43:49 +01:00
content_asset.rb	rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)	2011-11-19 15:47:56 +01:00
content_instance.rb	Merge branch 'master' into rails_3_1	2011-12-18 01:18:56 +08:00
content_type.rb	Merge branch 'master' into rails_3_1	2011-12-15 22:29:07 +08:00
editable_element.rb	fix various namespace errors issues and api changes for the models	2011-11-10 13:41:20 -08:00
editable_file.rb	refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack	2011-11-21 02:27:05 +01:00
editable_long_text.rb	refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack	2011-11-21 02:27:05 +01:00
editable_short_text.rb	refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack	2011-11-21 02:27:05 +01:00
membership.rb	the screen for editing site has been refactored	2011-11-29 14:58:19 +01:00
page.rb	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
site.rb	the screen for editing site has been refactored	2011-11-29 14:58:19 +01:00
snippet.rb	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
theme_asset.rb	theme assets page in progress	2011-12-07 02:09:13 +01:00