Mario Visic 75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock features/support/env.rb locomotive_cms.gemspec spec/cells/locomotive/global_actions_spec.rb spec/cells/locomotive/main_menu_cell_spec.rb spec/cells/locomotive/settings_menu_cell_spec.rb		2012-01-14 16:37:24 +10:30
..
base.rb	Revert "Arrays now paginate correctly."	2011-10-24 23:34:43 +08:00
content_entry.rb	listing all entries (done) + fix bugs + tweak ui	2012-01-04 02:07:53 +01:00
content_types.rb	refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder)	2012-01-09 06:49:59 -08:00
page.rb	content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API	2011-12-23 00:45:32 +01:00
site.rb	remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring	2011-07-04 19:40:14 +02:00