Started moving, deleting to prepare for conversion to a slice
commiteca5dfd9ce428a4e4dae7ccb5509e45a3c430c76
authorAlex Coles <alexbcoles@mac.com>
Sat, 31 May 2008 12:51:11 +0000 (31 14:51 +0200)
committerAlex Coles <alexbcoles@mac.com>
Sat, 31 May 2008 12:51:11 +0000 (31 14:51 +0200)
tree69a27eaf9ea064af2f393e1af6dbfbba371ac722
parent19dc71d33a01bba532aa64ba32cd628cf1b14b61
Started moving, deleting to prepare for conversion to a slice

* Moved, deleted Merb-application (as opposed to
  slice) specific files.
* Removed various user authentication files.
* Moved models and specs up a level.
* Should allow for clean(er) merging with forked
  merb-e-mart slice.
75 files changed:
app/mailers/user_mailer.rb [deleted file]
app/mailers/views/layout/application.html.erb [deleted file]
app/mailers/views/layout/application.text.erb [deleted file]
app/mailers/views/user_mailer/activation_notification.html.erb [deleted file]
app/mailers/views/user_mailer/activation_notification.text.erb [deleted file]
app/mailers/views/user_mailer/signup_notification.html.erb [deleted file]
app/mailers/views/user_mailer/signup_notification.text.erb [deleted file]
app/models/abstract_upload.rb [moved from app/models/mart/abstract_upload.rb with 100% similarity]
app/models/accounts/abstract_account.rb [moved from app/models/mart/accounts/abstract_account.rb with 100% similarity]
app/models/accounts/bank_account.rb [moved from app/models/mart/accounts/bank_account.rb with 100% similarity]
app/models/accounts/credit_card_account.rb [moved from app/models/mart/accounts/credit_card_account.rb with 100% similarity]
app/models/accounts/google_checkout_account.rb [moved from app/models/mart/accounts/google_checkout_account.rb with 100% similarity]
app/models/accounts/paypal_account.rb [moved from app/models/mart/accounts/paypal_account.rb with 100% similarity]
app/models/asset.rb [moved from app/models/mart/asset.rb with 100% similarity]
app/models/customer.rb [moved from app/models/mart/customer.rb with 100% similarity]
app/models/customers/cart.rb [moved from app/models/mart/customers/cart.rb with 100% similarity]
app/models/customers/wishlist_item.rb [moved from app/models/mart/customers/wishlist_item.rb with 100% similarity]
app/models/image.rb [moved from app/models/mart/image.rb with 100% similarity]
app/models/order.rb [moved from app/models/mart/order.rb with 100% similarity]
app/models/orders/line_item.rb [moved from app/models/mart/orders/line_item.rb with 100% similarity]
app/models/orders/status_code.rb [moved from app/models/mart/orders/status_code.rb with 100% similarity]
app/models/right.rb [deleted file]
app/models/role.rb [deleted file]
app/models/shipping/type.rb [moved from app/models/mart/shipping/type.rb with 100% similarity]
app/models/shipping/weight.rb [moved from app/models/mart/shipping/weight.rb with 100% similarity]
app/models/store/abstract_item.rb [moved from app/models/mart/store/abstract_item.rb with 100% similarity]
app/models/store/product.rb [moved from app/models/mart/store/product.rb with 100% similarity]
app/models/store/product_image.rb [moved from app/models/mart/store/product_image.rb with 100% similarity]
app/models/store/promotion.rb [moved from app/models/mart/store/promotion.rb with 100% similarity]
app/models/store/variation.rb [moved from app/models/mart/store/variation.rb with 100% similarity]
app/parts/views/layout/application.html.haml [deleted file]
app/views/sessions/new.html.haml [deleted file]
app/views/users/new.html.haml [deleted file]
autotest.bak/discover.rb [deleted file]
autotest.bak/merb.rb [deleted file]
autotest.bak/merb_rspec.rb [deleted file]
config/database.sample.yml [deleted file]
config/environments/development.rb [deleted file]
config/environments/production.rb [deleted file]
config/environments/rake.rb [deleted file]
config/environments/test.rb [deleted file]
config/init.rb [deleted file]
config/rack.rb [deleted file]
config/router.rb [deleted file]
db/.gitignore [deleted file]
lib/authenticated_system/authenticated_dependencies.rb [deleted file]
lib/authenticated_system/authenticated_routes.rb [deleted file]
lib/authenticated_system/authenticated_system_controller.rb [deleted file]
lib/authenticated_system/authenticated_system_model.rb [deleted file]
lib/authenticated_system/authenticated_system_orm_map.rb [deleted file]
lib/merb-e-mart.rb [moved from lib/mart.rb with 100% similarity]
public/images/merb.jpg [deleted file]
public/javascripts/jquery-1.2.3.js [moved from public/js/jquery-1.2.3.js with 100% similarity]
public/merb.fcgi [deleted file]
spec/models/abstract_upload_spec.rb [moved from spec/models/mart/abstract_upload_spec.rb with 100% similarity]
spec/models/accounts/abstract_account_spec.rb [moved from spec/models/mart/accounts/abstract_account_spec.rb with 100% similarity]
spec/models/accounts/bank_account_spec.rb [moved from spec/models/mart/accounts/bank_account_spec.rb with 100% similarity]
spec/models/accounts/credit_card_account_spec.rb [moved from spec/models/mart/accounts/credit_card_account_spec.rb with 100% similarity]
spec/models/accounts/google_checkout_account_spec.rb [moved from spec/models/mart/accounts/google_checkout_account_spec.rb with 100% similarity]
spec/models/accounts/paypal_account_spec.rb [moved from spec/models/mart/accounts/paypal_account_spec.rb with 100% similarity]
spec/models/asset_spec.rb [moved from spec/models/mart/asset_spec.rb with 100% similarity]
spec/models/customer_spec.rb [moved from spec/models/mart/customer_spec.rb with 100% similarity]
spec/models/customers/cart_spec.rb [moved from spec/models/mart/customers/cart_spec.rb with 100% similarity]
spec/models/customers/wishlist_item_spec.rb [moved from spec/models/mart/customers/wishlist_item_spec.rb with 100% similarity]
spec/models/image_spec.rb [moved from spec/models/mart/image_spec.rb with 100% similarity]
spec/models/order_spec.rb [moved from spec/models/mart/order_spec.rb with 100% similarity]
spec/models/orders/line_item_spec.rb [moved from spec/models/mart/orders/line_item_spec.rb with 100% similarity]
spec/models/orders/status_code_spec.rb [moved from spec/models/mart/orders/status_code_spec.rb with 100% similarity]
spec/models/shipping/type_spec.rb [moved from spec/models/mart/shipping/type_spec.rb with 100% similarity]
spec/models/shipping/weight_spec.rb [moved from spec/models/mart/shipping/weight_spec.rb with 100% similarity]
spec/models/store/abstract_item_spec.rb [moved from spec/models/mart/store/abstract_item_spec.rb with 100% similarity]
spec/models/store/product_image_spec.rb [moved from spec/models/mart/store/product_image_spec.rb with 100% similarity]
spec/models/store/product_spec.rb [moved from spec/models/mart/store/product_spec.rb with 100% similarity]
spec/models/store/promotion_spec.rb [moved from spec/models/mart/store/promotion_spec.rb with 100% similarity]
spec/models/store/variation_spec.rb [moved from spec/models/mart/store/variation_spec.rb with 100% similarity]