Permalink
Switch branches/tags
Nothing to show
Commits on Aug 17, 2009
  1. Create note on discontinued development

    Signed-off-by: Alex Coles <alex@alexcolesportfolio.com>
    committed Aug 17, 2009
Commits on Nov 2, 2008
  1. Fix a few missed renames

    committed Nov 2, 2008
  2. 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 ec3649d.
    
        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.
    committed Nov 2, 2008
Commits on Jun 2, 2008
  1. Whitespace cleanup

    committed Jun 2, 2008
Commits on May 31, 2008
  1. Updating Rakefile and README docs.

    * Moving README content into README.markdown, INSTALL docs
    * Renaming project to Merb eMart in HAML templates.
    committed May 31, 2008
  2. Renaming project to Merb eMart

    * Removing conflicting LICENSE file
    committed May 31, 2008
  3. Removing conflicting LICENSE file

    committed May 31, 2008
  4. 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
    committed May 31, 2008
  5. 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.
    committed May 31, 2008
  6. Updating to reflect changes in DM 0.9.1

    * Convert FixNum to Integer
    * Fixed some failing specs
    * Added spec.opts
    committed May 31, 2008
Commits on May 30, 2008
  1. started Quick-E-Mart example.

    benburkert committed May 30, 2008
Commits on May 29, 2008
Commits on May 28, 2008
Commits on May 27, 2008
  1. finished move to merb-E-mart.

    benburkert committed May 27, 2008
  2. first commit

    benburkert committed May 27, 2008
Commits on May 16, 2008
  1. Whitespace cleanup

    committed May 16, 2008
Commits on May 10, 2008
  1. 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)
    committed May 10, 2008
Commits on May 8, 2008
  1. Changed State to use composite, natural keys.

    * Updated spec (short-hand notation not working).
    committed May 8, 2008
  2. 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.
    committed May 8, 2008
  3. 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.
    committed May 8, 2008
  4. 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).
    committed May 8, 2008
Commits on May 7, 2008
  1. Fixed UserMailer specs

    * Fixed catch_content in application ERB templates.
    * Also, added parentheses for method call.
    committed May 7, 2008
  2. Temporarily moving autotest/ to autotest.bak

    * merb-gen produced autotest code was
      causing autotest to keep reloading specs
      even when changes weren't made.
    committed May 7, 2008
  3. Merge branch 'master' of git@github.com:myabc/merb_mart

    Conflicts:
    
    	spec/spec.opts
    committed May 7, 2008
  4. Cleanup, merge in changes to merb-core 0.9.3 (retry)

    * Merge in changes in merb-core, based on a newly
      generated merb-core 0.9.3 generated app.
      - Various small changes, including new rake env.
      - New autotest/ directory. Deleted out .autotest.
    * Added in a couple missing methods provided by
      merbful_authentication generator. Fixed missing
      activation code routes.
    * Update list of dependencies in INSTALL and versions.
    * Reorganize code in init.rb for clarity. Add FIXMEs.
    * Uncomment validations and hooks in User.
    * Added GPL header to init.rb.
    * Updated copyright year to 2008.
    committed May 7, 2008
  5. Cleanup, merge in changes to merb-core 0.9.3

    * Merge in changes in merb-core, based on a newly
      generated merb-core 0.9.3 generated app.
      - Various small changes, including new rake env.
      - New autotest/ directory. Deleted out .autotest.
    * Added in a couple missing methods provided by
      merbful_authentication generator. Fixed missing
      activation code routes.
    * Update list of dependencies in INSTALL and versions.
    * Reorganize code in init.rb for clarity. Add FIXMEs.
    * Uncomment validations and hooks in User.
    * Added GPL header to init.rb.
    * Updated copyright year to 2008.
    committed May 7, 2008