* This should get us to a point where we have a slice named MerbMart. We still need to do a fair amount of work to clean things up to get stuff working properly. Squashed commit of the following: commit 9b19f8b36148cdd0a266136fa522851a8a966d12 Author: Alex Coles <firstname.lastname@example.org> Date: Sun Nov 2 22:48:21 2008 +0100 Normalize name of slice. Further consolidation of slice-attempt. * Cleanup naming conventions: MerbMart and merb_mart * Adding init.rb and router.rb files to allow for standalone running. commit b6257d682e71eb695f61561fe8f17453c20e77ce Author: Alex Coles <email@example.com> Date: Sun Nov 2 22:33:40 2008 +0100 Re-removing incompatible license commit 137a488f76b17e4889eaec239b06d2855da47f00 Author: Alex Coles <firstname.lastname@example.org> Date: Sun Nov 2 22:32:51 2008 +0100 Revert "Renaming project to Merb eMart" This reverts commit ec3649d. Conflicts: README.markdown Rakefile commit eddc44217b247531ef20226ae4d5a20f2a0d8b53 Author: Alex Coles <email@example.com> Date: Sun Nov 2 22:18:34 2008 +0100 Consolidation of attempt to slicify app. * Removing model classes that overlap between Ben's sliceified app, and the original monolithic app. * Updated and added in slice code to make it look like, and work as a merb 0.9.12 slice. * Some renaming of directories/files to account for rename back to merb_mart/MerbMart.
Conflicts: .gitignore README Rakefile TODO app/controllers/application.rb app/models/address.rb app/models/country.rb app/models/order.rb app/models/state.rb app/models/user.rb public/stylesheets/master.css spec/models/address_spec.rb spec/models/country_spec.rb spec/models/order_spec.rb spec/models/state_spec.rb spec/models/user_spec.rb spec/spec_helper.rb