Code

Shoppersellertoggle#11

Code

Open

khinlatt wants to merge 70 commits intotheironyard-rails-atl:mastertheironyard-rails-atl/iron-shop:masterfrom danarch:shoppersellertoggledanarch/iron-shop:shoppersellertoggleCopy head branch name to clipboard

+2,324-79

Commits

Commits on Sep 22, 2014

• adding angular

  mattathompson

  committed
  88373f9

  Copy full SHA for 88373f9

• Adding columns to User ROLE ADMIN

  mattathompson

  committed
  2d29257

  Copy full SHA for 2d29257

• creating item & invoice models

  mattathompson

  committed
  6d2cba9

  Copy full SHA for 6d2cba9

• Merge pull request #1 from danarch/migration_and_bundler

  Show description for 1ac8d7c
  danarch

  committed
  1ac8d7c

  Copy full SHA for 1ac8d7c

• need work on joined invoices and items

  khinlatt

  committed
  1fb06f0

  Copy full SHA for 1fb06f0

• passing items and invoices spec

  khinlatt

  committed
  77b0161

  Copy full SHA for 77b0161

• created cart version 1

  khinlatt

  committed
  e7198f4

  Copy full SHA for e7198f4

• Merge pull request #2 from danarch/InvoicesItems

  Show description for a3a0e20
  danarch

  committed
  a3a0e20

  Copy full SHA for a3a0e20

Commits on Sep 23, 2014

• Finishing up the current specs

  mattathompson

  committed
  26b1f51

  Copy full SHA for 26b1f51

• Merge pull request #3 from danarch/finishing_tests

  Show description for 3c4f8ca
  danarch

  committed
  3c4f8ca

  Copy full SHA for 3c4f8ca

• adding controller routes for items

  mattathompson

  committed
  68f1991

  Copy full SHA for 68f1991

• some basic auth with cancancan about creating editing and destroying items

  mattathompson

  committed
  01380c9

  Copy full SHA for 01380c9

Commits on Sep 24, 2014

• refactor database with cart as ActiveRecord::Base

  danarch

  committed
  c696b50

  Copy full SHA for c696b50

• working full text pg-search

  khinlatt

  committed
  e7fc6e7

  Copy full SHA for e7fc6e7

• added some mailer and sidekiq

  danarch

  committed
  92361ec

  Copy full SHA for 92361ec

• Merge pull request #5 from danarch/cancancan_2

  Show description for bebe46a
  danarch

  committed
  bebe46a

  Copy full SHA for bebe46a

• resolve merge conflicts fro stripe branch"

  danarch

  committed
  75a16e4

  Copy full SHA for 75a16e4

• Merge pull request #6 from danarch/stripe

  Show description for 8edab9b
  mattathompson

  committed
  8edab9b

  Copy full SHA for 8edab9b

• changing merge conflicts

  khinlatt

  committed
  f668a25

  Copy full SHA for f668a25

• working pg_search and faker to populate

  khinlatt

  committed
  3b55423

  Copy full SHA for 3b55423

• get cart activerecord model passing specs

  danarch

  committed
  25b9364

  Copy full SHA for 25b9364

• Merge pull request #8 from danarch/stripe

  Show description for 3aa4481
  mattathompson

  committed
  3aa4481

  Copy full SHA for 3aa4481

• commit gemlock

  mattathompson

  committed
  732afe2

  Copy full SHA for 732afe2

• Fixed merge conflicts

  mattathompson

  committed
  0bce005

  Copy full SHA for 0bce005

• add shopping cart

  khinlatt

  committed
  b9d3e71

  Copy full SHA for b9d3e71

• stupid gemfile.lock

  khinlatt

  committed
  6645a87

  Copy full SHA for 6645a87

• Merge branch 'master' of https://github.com/danarch/iron-shop

  khinlatt

  committed
  67d9c3c

  Copy full SHA for 67d9c3c

• remove binding of pry and require sidekiq web for the mo

  danarch

  committed
  586db54

  Copy full SHA for 586db54

• merged after new cart table

  khinlatt

  committed
  14d3260

  Copy full SHA for 14d3260

• specs working after adding carts table

  khinlatt

  committed
  687ac76

  Copy full SHA for 687ac76

• Merge pull request #7 from danarch/ElasticSearch

  Show description for b6c3737
  mattathompson

  committed
  b6c3737

  Copy full SHA for b6c3737

• Remove Tire

  mattathompson

  committed
  1cff33b

  Copy full SHA for 1cff33b

• removed tire

  khinlatt

  committed
  31ce657

  Copy full SHA for 31ce657

• finally a merged master that works

  mattathompson

  committed
  2b71449

  Copy full SHA for 2b71449

• remove elasticsearch and tire

  danarch

  committed
  4a673ff

  Copy full SHA for 4a673ff

• merge master to stripe branch

  danarch

  committed
  5daccaf

  Copy full SHA for 5daccaf

• begin stripe integration with javascript button and gem

  danarch

  committed
  c0e3f32

  Copy full SHA for c0e3f32

Commits on Sep 25, 2014

• Stripe specs passing

  danarch

  committed
  1b533e5

  Copy full SHA for 1b533e5

• background mailer working; just call send_receipt method

  khinlatt

  committed
  4967bfd

  Copy full SHA for 4967bfd

• Working views that allow users to add items to carts

  mattathompson

  committed
  5b949dc

  Copy full SHA for 5b949dc

• Merge pull request #9 from danarch/cart_items

  Show description for d94fb1c
  mattathompson

  committed
  d94fb1c

  Copy full SHA for d94fb1c

• merge master into working stripe feature

  danarch

  committed
  5dde4b7

  Copy full SHA for 5dde4b7

• Set up Devise background mailer

  khinlatt

  committed
  8da87ba

  Copy full SHA for 8da87ba

• Merge pull request #12 from danarch/cart_items

  Show description for 46f2955
  danarch

  committed
  46f2955

  Copy full SHA for 46f2955

• Merge branch 'master' into stripe

  danarch

  committed
  4f71ebe

  Copy full SHA for 4f71ebe

• Merge branch 'master' of https://github.com/danarch/iron-shop

  khinlatt

  committed
  7465ebb

  Copy full SHA for 7465ebb

• Merge branch 'master' into backgroundmailer

  khinlatt

  committed
  1727092

  Copy full SHA for 1727092

• Merge pull request #11 from danarch/stripe

  Show description for 70785ff
  mattathompson

  committed
  70785ff

  Copy full SHA for 70785ff

• Merge branch 'master' of https://github.com/danarch/iron-shop

  khinlatt

  committed
  0c9eb77

  Copy full SHA for 0c9eb77

• Merge branch 'master' into backgroundmailer

  khinlatt

  committed
  af01d2b

  Copy full SHA for af01d2b

• Merge pull request #13 from danarch/backgroundmailer

  Show description for 00fabad
  danarch

  committed
  00fabad

  Copy full SHA for 00fabad

• Fully funcitioning cart actions

  mattathompson

  committed
  a32f0b6

  Copy full SHA for a32f0b6

• refactor invoices controller for error handling

  danarch

  committed
  65ce2b2

  Copy full SHA for 65ce2b2

• Merge pull request #14 from danarch/finished_cart

  Show description for d73fd2a
  danarch

  committed
  d73fd2a

  Copy full SHA for d73fd2a

• use Matt's checkout controller action

  danarch

  committed
  3adf708

  Copy full SHA for 3adf708

• adding some javascript for formating item descriptions and worked on item editing permissions

  mattathompson

  committed
  0070277

  Copy full SHA for 0070277

• Merge branch 'master' into finished_cart

  mattathompson

  committed
  3c4348c

  Copy full SHA for 3c4348c

• Merge pull request #15 from danarch/stripe

  Show description for 87caec1
  mattathompson

  committed
  87caec1

  Copy full SHA for 87caec1

• Merge branch 'master' into finished_cart

  mattathompson

  committed
  3524c8e

  Copy full SHA for 3524c8e

• Set up changing role - function only

  khinlatt

  committed
  ee452a5

  Copy full SHA for ee452a5

• role changing looks nicer now but ugly code

  khinlatt

  committed
  b767c54

  Copy full SHA for b767c54

• adding price to header next to shopping cart

  mattathompson

  committed
  ca3030c

  Copy full SHA for ca3030c

• Add a bit of javascript to check radio button

  khinlatt

  committed
  5db8754

  Copy full SHA for 5db8754

• Merge branch 'master' into shoppersellertoggle

  khinlatt

  committed
  7b2544a

  Copy full SHA for 7b2544a

Commits on Sep 26, 2014

• Clearing the cart when invoice is paid. Also some stylistic changes

  mattathompson

  committed
  638cd9f

  Copy full SHA for 638cd9f

• Adding Amazon aws and Paperclip to items.

  mattathompson

  committed
  93d16fa

  Copy full SHA for 93d16fa

• Merge pull request #17 from danarch/Style_changes_and_clearing_the_cart

  Show description for 7acaa58
  danarch

  committed
  7acaa58

  Copy full SHA for 7acaa58

• Merge branch 'master' into shoppersellertoggle

  khinlatt

  committed
  138f01b

  Copy full SHA for 138f01b

• Merge pull request #18 from danarch/aws_for_items

  Show description for 50f2246
  khinlatt

  committed
  50f2246

  Copy full SHA for 50f2246

• Merge branch 'master' into shoppersellertoggle

  khinlatt

  committed
  b2d6618

  Copy full SHA for b2d6618