Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shoppersellertoggle #11

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open

Shoppersellertoggle #11

wants to merge 70 commits into from

Commits on Sep 22, 2014

  1. adding angular

    @mattathompson
    mattathompson committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    88373f9 View commit details
    Browse the repository at this point in the history

  2. Adding columns to User ROLE ADMIN

    @mattathompson
    mattathompson committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    2d29257 View commit details
    Browse the repository at this point in the history

  3. creating item & invoice models

    @mattathompson
    mattathompson committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    6d2cba9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from danarch/migration_and_bundler 

    Migration and bundler
    @danarch
    danarch committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    1ac8d7c View commit details
    Browse the repository at this point in the history

  5. need work on joined invoices and items

    @khinlatt
    khinlatt committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    1fb06f0 View commit details
    Browse the repository at this point in the history

  6. passing items and invoices spec

    @khinlatt
    khinlatt committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    77b0161 View commit details
    Browse the repository at this point in the history

  7. created cart version 1

    @khinlatt
    khinlatt committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    e7198f4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2 from danarch/InvoicesItems 

    Invoices items
    @danarch
    danarch committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    a3a0e20 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2014

  1. Finishing up the current specs

    @mattathompson
    mattathompson committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    26b1f51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from danarch/finishing_tests 

    Finishing up the current specs
    @danarch
    danarch committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    3c4f8ca View commit details
    Browse the repository at this point in the history

  3. adding controller routes for items

    @mattathompson
    mattathompson committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    68f1991 View commit details
    Browse the repository at this point in the history

  4. some basic auth with cancancan about creating editing and destroying … 

    …items
    @mattathompson
    mattathompson committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    01380c9 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. refactor database with cart as ActiveRecord::Base

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    c696b50 View commit details
    Browse the repository at this point in the history

  2. working full text pg-search

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    e7fc6e7 View commit details
    Browse the repository at this point in the history

  3. added some mailer and sidekiq

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    92361ec View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from danarch/cancancan_2 

    Cancancan & getting some basic view/controller/routes working.
    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    bebe46a View commit details
    Browse the repository at this point in the history

  5. resolve merge conflicts fro stripe branch"

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    75a16e4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6 from danarch/stripe 

    Some sidekiq and Stripe config WIP
    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    8edab9b View commit details
    Browse the repository at this point in the history

  7. changing merge conflicts

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    f668a25 View commit details
    Browse the repository at this point in the history

  8. working pg_search and faker to populate

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    3b55423 View commit details
    Browse the repository at this point in the history

  9. get cart activerecord model passing specs

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    25b9364 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #8 from danarch/stripe 

    get cart activerecord model passing specs
    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    3aa4481 View commit details
    Browse the repository at this point in the history

  11. commit gemlock

    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    732afe2 View commit details
    Browse the repository at this point in the history

  12. Fixed merge conflicts

    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    0bce005 View commit details
    Browse the repository at this point in the history

  13. add shopping cart

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    b9d3e71 View commit details
    Browse the repository at this point in the history

  14. stupid gemfile.lock

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    6645a87 View commit details
    Browse the repository at this point in the history

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

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    67d9c3c View commit details
    Browse the repository at this point in the history

  16. remove binding of pry and require sidekiq web for the mo

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    586db54 View commit details
    Browse the repository at this point in the history

  17. merged after new cart table

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    14d3260 View commit details
    Browse the repository at this point in the history

  18. specs working after adding carts table

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    687ac76 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #7 from danarch/ElasticSearch 

    Pg search included
    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    b6c3737 View commit details
    Browse the repository at this point in the history

  20. Remove Tire

    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    1cff33b View commit details
    Browse the repository at this point in the history

  21. removed tire

    @khinlatt
    khinlatt committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    31ce657 View commit details
    Browse the repository at this point in the history

  22. finally a merged master that works

    @mattathompson
    mattathompson committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    2b71449 View commit details
    Browse the repository at this point in the history

  23. remove elasticsearch and tire

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    4a673ff View commit details
    Browse the repository at this point in the history

  24. merge master to stripe branch

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    5daccaf View commit details
    Browse the repository at this point in the history

  25. begin stripe integration with javascript button and gem

    @danarch
    danarch committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    c0e3f32 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2014

  1. Stripe specs passing

    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    1b533e5 View commit details
    Browse the repository at this point in the history

  2. background mailer working; just call send_receipt method

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    4967bfd View commit details
    Browse the repository at this point in the history

  3. Working views that allow users to add items to carts

    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    5b949dc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from danarch/cart_items 

    Cart items
    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    d94fb1c View commit details
    Browse the repository at this point in the history

  5. merge master into working stripe feature

    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    5dde4b7 View commit details
    Browse the repository at this point in the history

  6. Set up Devise background mailer

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    8da87ba View commit details
    Browse the repository at this point in the history

  7. Merge pull request #12 from danarch/cart_items 

    Cart items
    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    46f2955 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into stripe

    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    4f71ebe View commit details
    Browse the repository at this point in the history

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

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    7465ebb View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into backgroundmailer

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    1727092 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #11 from danarch/stripe 

    Stripe
    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    70785ff View commit details
    Browse the repository at this point in the history

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

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    0c9eb77 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into backgroundmailer

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    af01d2b View commit details
    Browse the repository at this point in the history

  14. Merge pull request #13 from danarch/backgroundmailer 

    Backgroundmailer
    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    00fabad View commit details
    Browse the repository at this point in the history

  15. Fully funcitioning cart actions

    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    a32f0b6 View commit details
    Browse the repository at this point in the history

  16. refactor invoices controller for error handling

    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    65ce2b2 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #14 from danarch/finished_cart 

    Fully functioning cart actions
    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    d73fd2a View commit details
    Browse the repository at this point in the history

  18. use Matt's checkout controller action

    @danarch
    danarch committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    3adf708 View commit details
    Browse the repository at this point in the history

  19. adding some javascript for formating item descriptions and worked on … 

    …item editing permissions
    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    0070277 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' into finished_cart

    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    3c4348c View commit details
    Browse the repository at this point in the history

  21. Merge pull request #15 from danarch/stripe 

    Stripe error handling refactoring
    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    87caec1 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into finished_cart

    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    3524c8e View commit details
    Browse the repository at this point in the history

  23. Set up changing role - function only

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    ee452a5 View commit details
    Browse the repository at this point in the history

  24. role changing looks nicer now but ugly code

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    b767c54 View commit details
    Browse the repository at this point in the history

  25. adding price to header next to shopping cart

    @mattathompson
    mattathompson committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    ca3030c View commit details
    Browse the repository at this point in the history

  26. Add a bit of javascript to check radio button

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    5db8754 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' into shoppersellertoggle

    @khinlatt
    khinlatt committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    7b2544a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2014

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

    @mattathompson
    mattathompson committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    638cd9f View commit details
    Browse the repository at this point in the history

  2. Adding Amazon aws and Paperclip to items.

    @mattathompson
    mattathompson committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    93d16fa View commit details
    Browse the repository at this point in the history

  3. Merge pull request #17 from danarch/Style_changes_and_clearing_the_cart 

    Style changes and clearing the cart
    @danarch
    danarch committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    7acaa58 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into shoppersellertoggle

    @khinlatt
    khinlatt committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    138f01b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from danarch/aws_for_items 

    Aws for items(Merge Second!) Rake db:migrate & bundle
    @khinlatt
    khinlatt committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    50f2246 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into shoppersellertoggle

    @khinlatt
    khinlatt committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    b2d6618 View commit details
    Browse the repository at this point in the history