4879d3ec5d8d2211ea43e329bcb48a72dbb86a01 Alex Coles alex@alexcolesportfolio.com http://github.com/myabc/merb_mart/commit/2d0ccf708aad6e02dc077aeac5e53553d852fb0a 2d0ccf708aad6e02dc077aeac5e53553d852fb0a

2009-08-17T13:33:34-07:00

Create note on discontinued development Signed-off-by: Alex Coles <alex@alexcolesportfolio.com> 204c84eb03c4e37417424b1f249d1c76aa608523 Alex Coles alex@alexcolesportfolio.com 42a37524004c92b1b0288bb5403f57bd855834c0 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/4879d3ec5d8d2211ea43e329bcb48a72dbb86a01 4879d3ec5d8d2211ea43e329bcb48a72dbb86a01

2008-11-02T13:58:46-08:00

Fix a few missed renames 539eb4c8a85a61ae7495b5757601497f98205015 Alex Coles alexbcoles@mac.com 4a76b9902c4077eeb41a6ad2971a6e11e5a9ed41 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/42a37524004c92b1b0288bb5403f57bd855834c0 42a37524004c92b1b0288bb5403f57bd855834c0

2008-11-02T13:51:40-08:00

Consolidation of work on slicefiying application with original app * 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 <alexbcoles@mac.com> 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 <alexbcoles@mac.com> Date: Sun Nov 2 22:33:40 2008 +0100 Re-removing incompatible license commit 137a488f76b17e4889eaec239b06d2855da47f00 Author: Alex Coles <alexbcoles@mac.com> Date: Sun Nov 2 22:32:51 2008 +0100 Revert "Renaming project to Merb eMart" This reverts commit ec3649debc6349ee6e4e685c0578211147e8e639. Conflicts: README.markdown Rakefile commit eddc44217b247531ef20226ae4d5a20f2a0d8b53 Author: Alex Coles <alexbcoles@mac.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. bcd59fe46604d273951f0132248abcce75aacdce Alex Coles alexbcoles@mac.com 409c08cc360d93260ad69a173f0516b77e8f9588 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/4a76b9902c4077eeb41a6ad2971a6e11e5a9ed41 4a76b9902c4077eeb41a6ad2971a6e11e5a9ed41

2008-06-02T06:05:25-07:00

Whitespace cleanup 11b58fbc5ccbd35cb76e43381ddc83009f507464 Alex Coles alexbcoles@mac.com bb986e0a00a0fc807c96cb669ccfb5dad5c5318b Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/409c08cc360d93260ad69a173f0516b77e8f9588 409c08cc360d93260ad69a173f0516b77e8f9588

2008-05-31T06:49:57-07:00

Updating Rakefile and README docs. * Moving README content into README.markdown, INSTALL docs * Renaming project to Merb eMart in HAML templates. 90dd4df867365f248f6405fd5a3b87886aa8fc6a Alex Coles alexbcoles@mac.com ec3649debc6349ee6e4e685c0578211147e8e639 5770c29fa20e4f8a41df8733ad87aa8bc31c4ecb Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/bb986e0a00a0fc807c96cb669ccfb5dad5c5318b bb986e0a00a0fc807c96cb669ccfb5dad5c5318b

2008-05-31T06:24:23-07:00

Merge branch 'master' of git@github.com:myabc/merb_mart ea965dc5a744f0224c37ae1441367cc6188accdc Alex Coles alexbcoles@mac.com 41c6875ee35250446ecbf6c7d7d0876ad51780da Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/ec3649debc6349ee6e4e685c0578211147e8e639 ec3649debc6349ee6e4e685c0578211147e8e639

2008-05-31T06:24:00-07:00

Renaming project to Merb eMart * Removing conflicting LICENSE file ea965dc5a744f0224c37ae1441367cc6188accdc Alex Coles alexbcoles@mac.com 41c6875ee35250446ecbf6c7d7d0876ad51780da Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/5770c29fa20e4f8a41df8733ad87aa8bc31c4ecb 5770c29fa20e4f8a41df8733ad87aa8bc31c4ecb

2008-05-31T06:12:06-07:00

Removing conflicting LICENSE file e9dd2fa6302ab845caf896ff104ff9b387248ea4 Alex Coles alexbcoles@mac.com eca5dfd9ce428a4e4dae7ccb5509e45a3c430c76 8655c0decb32d4159161863dc96d882c6bc33f75 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/41c6875ee35250446ecbf6c7d7d0876ad51780da 41c6875ee35250446ecbf6c7d7d0876ad51780da

2008-05-31T06:08:19-07:00

Merge commit 'ben/master' 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 c1fcc05e56d6ff972cb9af4afcc1f7087fd89f7c Alex Coles alexbcoles@mac.com 19dc71d33a01bba532aa64ba32cd628cf1b14b61 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/eca5dfd9ce428a4e4dae7ccb5509e45a3c430c76 eca5dfd9ce428a4e4dae7ccb5509e45a3c430c76

2008-05-31T05:51:11-07:00

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. 69a27eaf9ea064af2f393e1af6dbfbba371ac722 Alex Coles alexbcoles@mac.com 1d63179ef1086e3d6ef6aeaa8b7456100beec2ce Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/19dc71d33a01bba532aa64ba32cd628cf1b14b61 19dc71d33a01bba532aa64ba32cd628cf1b14b61

2008-05-31T04:46:44-07:00

Updating to reflect changes in DM 0.9.1 * Convert FixNum to Integer * Fixed some failing specs * Added spec.opts d8254f365bcdd8226c461333874f5c2b70c95f1c Alex Coles alexbcoles@mac.com 373af421e59b84473cd5035e4c1de2487278ce2b Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/8655c0decb32d4159161863dc96d882c6bc33f75 8655c0decb32d4159161863dc96d882c6bc33f75

2008-05-30T13:18:48-07:00

started Quick-E-Mart example. da375009d6574fec459206733dedc973ae04f6fd Ben Burkert ben@benburkert.com d8aec6828d52792f3a7a71abb1010fd4e9640be3 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/373af421e59b84473cd5035e4c1de2487278ce2b 373af421e59b84473cd5035e4c1de2487278ce2b

2008-05-29T16:36:20-07:00

Added ShippingInfo and Upload specs. 7d1f6a138881064f0fd75e1bde7b173ced36984b Ben Burkert ben@benburkert.com d715f60f286d97d0492f0340c463f94e9225956d Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/d8aec6828d52792f3a7a71abb1010fd4e9640be3 d8aec6828d52792f3a7a71abb1010fd4e9640be3

2008-05-29T13:27:17-07:00

Added example of a non-working 'has 1, :through =>' association. ab62873a586871771e3d3c3e7051deffc6a82484 Ben Burkert ben@benburkert.com 27655025fd7de5e8793677de8e98f1b9d106b315 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/d715f60f286d97d0492f0340c463f94e9225956d d715f60f286d97d0492f0340c463f94e9225956d

2008-05-29T13:22:20-07:00

Added Weight specs. Shuffling things around. 2489475554135543345c3d2195fb43dc97728bad Ben Burkert ben@benburkert.com b7bde8e868d0eb93df887064935a9e66e376fe67 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/27655025fd7de5e8793677de8e98f1b9d106b315 27655025fd7de5e8793677de8e98f1b9d106b315

2008-05-29T11:43:52-07:00

Started Transaction model & specs. Added specs for order. 14b48a41d1b8b373e80c7e7b02e2780c84a0f285 Ben Burkert ben@benburkert.com b03c2fcf421f63126f75c2d5b7979d0eeed1bdc6 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/b7bde8e868d0eb93df887064935a9e66e376fe67 b7bde8e868d0eb93df887064935a9e66e376fe67

2008-05-28T16:01:25-07:00

Added specs for item & line item. 2dc3d8c7b41cecbaee7ca07607848ef3620217fc Ben Burkert ben@benburkert.com ebc196f2cd1ada535a9d74b49af2aecc6f774a36 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/b03c2fcf421f63126f75c2d5b7979d0eeed1bdc6 b03c2fcf421f63126f75c2d5b7979d0eeed1bdc6

2008-05-27T22:11:02-07:00

Added specs for Account and Customer. 2f547155577b956c52aac99a5988eec88a79bc0c Ben Burkert ben@benburkert.com 5177f42c71f69fdd85a944e873cf678598825ff9 Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/ebc196f2cd1ada535a9d74b49af2aecc6f774a36 ebc196f2cd1ada535a9d74b49af2aecc6f774a36

2008-05-27T18:55:18-07:00

Ported most models from merb_mart. d78f16fc8af29909204913aac2d0b6e53c7e7197 Ben Burkert ben@benburkert.com 0ea1dad8fa4fbd5a7a655653bb6cd8dc47454a4c Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/5177f42c71f69fdd85a944e873cf678598825ff9 5177f42c71f69fdd85a944e873cf678598825ff9

2008-05-27T09:33:30-07:00

finished move to merb-E-mart. 3f21da43676bdb084cf0cd5108b899f4174bf344 Ben Burkert ben@benburkert.com Ben Burkert ben@benburkert.com http://github.com/myabc/merb_mart/commit/0ea1dad8fa4fbd5a7a655653bb6cd8dc47454a4c 0ea1dad8fa4fbd5a7a655653bb6cd8dc47454a4c

2008-05-27T09:18:14-07:00

first commit 5652ea2655d482422fe9b81708b13d45e7bdfee6 Ben Burkert ben@benburkert.com 37f3b639f05213d2459ee54a826481d415ac5e00 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/1d63179ef1086e3d6ef6aeaa8b7456100beec2ce 1d63179ef1086e3d6ef6aeaa8b7456100beec2ce

2008-05-16T01:57:01-07:00

Whitespace cleanup 1b4dc274477c6a691399122f0391da1522948f74 Alex Coles alexbcoles@mac.com f97e83b696c51778e0f79a61877ebda689428069 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/37f3b639f05213d2459ee54a826481d415ac5e00 37f3b639f05213d2459ee54a826481d415ac5e00

2008-05-10T13:07:31-07:00

Updating to reflect latest changes in DM 0.9 * Removed explicit DataMapper::Validate. * Insured all models have keys. * Renamed validation methods to reflect changes in dm-validations. * Made all money-related fields BigDecimals (pending availability of custom Money DM::Type) 8ecd970aa3138079e4a414af34d2879f4906f513 Alex Coles alexbcoles@mac.com 72213a301782666f2277ba78d342274676328233 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/f97e83b696c51778e0f79a61877ebda689428069 f97e83b696c51778e0f79a61877ebda689428069

2008-05-08T04:40:34-07:00

Changed State to use composite, natural keys. * Updated spec (short-hand notation not working). 30e73b270a9c517f7797ccd1a2e2c6c167cc00e0 Alex Coles alexbcoles@mac.com 8388fe58541d56708c0b85fcc0e940d7946c9179 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/72213a301782666f2277ba78d342274676328233 72213a301782666f2277ba78d342274676328233

2008-05-08T03:15:21-07:00

Added additional dependencies. * Added JQuery. * Expanded documentation for taxonomy, geo classes. * Added TODO for composite keys in Country. * Added merb_stories dependency. * Added note on merb_stories bug + workaround in INSTALL. * Added CSS, JS and additional text to view templates, added example view spec. 814b722a9527d1e15ccc4313fcfb168e5081bbb6 Alex Coles alexbcoles@mac.com cc109e953862f2a7501b1d033612a5dac4ec2644 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/8388fe58541d56708c0b85fcc0e940d7946c9179 8388fe58541d56708c0b85fcc0e940d7946c9179

2008-05-07T19:06:13-07:00

Removing specs for deleted controllers, helpers. f487fe69713a945be289f5f413e211423be8ff01 Alex Coles alexbcoles@mac.com e5e879ebc205d7f055885f29c9526e94d3e45606 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/cc109e953862f2a7501b1d033612a5dac4ec2644 cc109e953862f2a7501b1d033612a5dac4ec2644

2008-05-07T18:55:40-07:00

Converted view ERB syntax to Haml 688bcb3d8929a69195c041db8cd10f0e74dc16aa Alex Coles alexbcoles@mac.com 82d5d35a57e3408aa5ae1857e93355bca7b9648a Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/e5e879ebc205d7f055885f29c9526e94d3e45606 e5e879ebc205d7f055885f29c9526e94d3e45606

2008-05-07T18:24:06-07:00

Update of controllers and views * Removing unused controllers and views. * Renaming view files to .haml, to allow for using Haml instead of ERB. * Added Haml as a dependency. * Set Store#index as default app page. 63af1419959d154e00cda55355ec427d28088a2b Alex Coles alexbcoles@mac.com 74660e9ab6d526687192e2a6383f852a3bc7d125 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/82d5d35a57e3408aa5ae1857e93355bca7b9648a 82d5d35a57e3408aa5ae1857e93355bca7b9648a

2008-05-07T17:32:49-07:00

Added dm-aggregates (for User class). 4139d747e8ff0e433b5bce68c8d920032d0fadd3 Alex Coles alexbcoles@mac.com 72c3e3b2d797d36dae849856b038adc3d23b2283 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/74660e9ab6d526687192e2a6383f852a3bc7d125 74660e9ab6d526687192e2a6383f852a3bc7d125

2008-05-07T17:13:14-07:00

Continued work on various models and specs * User class: - Replaced use of Time with DateTime in User class. - Added if procs to validates_presence_of validations, made password_required? method public, to allow usage with proc. - Commented out class method hooks temporarily. - Fixed finder syntax (not working correctly). * Country class: - Added auto_migrate! method to be run on each spec. - Fixed issue with primary key, defined as auto-incrementing. * Fixed failing product spec. * Commented out various shipping type specs (this class may need to be rewritten). fc714e5a02703a070de494266089814c792b0a59 Alex Coles alexbcoles@mac.com