Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/initializers/will_paginate.rb lib/locomotive/engine.rb lib/locomotive/hosting/bushido/account_ext.rb lib/locomotive/hosting/bushido/enabler.rb lib/locomotive/hosting/bushido/hooks.rb		2011-11-20 21:08:23 +11:00
..
cells/admin	working on fixing issues with devise (wip)	2011-11-04 16:55:51 +01:00
controllers/admin	fix issue #201	2011-09-14 11:32:14 +02:00
dummy	use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip)	2011-11-09 02:35:59 +01:00
fixtures	fix issue #193	2011-09-22 01:38:23 +02:00
lib	Merge remote-tracking branch 'origin/master' into rails_3_1	2011-11-20 21:08:23 +11:00
models	fix issue #217 (memberships not correctly removed)	2011-09-28 18:27:29 +02:00
requests	refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave	2011-06-28 15:38:13 +02:00
support	working on fixing issues with devise (wip)	2011-11-04 16:55:51 +01:00
factories.rb	Added a failing test for paginating has many associations.	2011-10-24 20:52:43 +08:00
spec_helper.rb	tweak the spec_helper.rb file (see issue #157)	2011-08-25 22:15:23 +02:00