Team Puffy Shirts bring you (parens) - #37

Open

miriam-cortes wants to merge 321 commits into

Ada-C6:masterfrom

miriam-cortes:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 20, 2016

added add to cart button
ninamutty
committed
ae185e2
Merge pull request #9 from miriam-cortes/merchant_show_and_edit
wilsab30
authored
788c44f
editing cart button
ninamutty
committed
9d25f60
added inventory to product seeds
ninamutty
committed
58a5eb9
merge conflicts
OLegge
committed
876d0a3
Merge pull request #10 from miriam-cortes/guests_controller
ninamutty
authored
5b4f322
merged master into products
ninamutty
committed
54763aa
Merge pull request #11 from miriam-cortes/products
miriam-cortes
authored
e53b8f9
added pry gem
ninamutty
committed
54dfa56
products and reviews model test complete
ninamutty
committed
34d7357
few things happening
miriam-cortes
committed
941fb5c
added delete buttons for reviews
ninamutty
committed
60f4c06
review and product controller tests done
ninamutty
committed
9b97ab9

Commits on Oct 21, 2016

merchant can now login using github and properly links to their show page
miriam-cortes
committed
b2d6570
categories tests complete, changed line-item fixture to add order_id etc
OLegge
committed
8d8a14b
category model validation test
OLegge
committed
38a78ea
Moved methods into model
wilsab30
committed
e193a86
nighttime miriam just doesn't get it
miriam-cortes
committed
e9c450e
Merge branch 'master' into SessionsController
wilsab30
committed
8889643
Merge branch 'master' into merchant_show_and_edit
miriam-cortes
committed
420c5a3
merged controller test
ninamutty
committed
6d1a63f
Merge pull request #12 from miriam-cortes/merchant_show_and_edit
ninamutty
authored
ff87495
Merge branch 'master' into SessionsController
wilsab30
committed
d948698
Merge branch 'master' into products
ninamutty
committed
4046fdc
Merge pull request #13 from miriam-cortes/products
miriam-cortes
authored
9b6e6ab
Merge branch 'master' into SessionsController
wilsab30
committed
8f00b8e
Updated Gemfile for Heroku
wilsab30
committed
a28532d
Updated Gemfile for Heroku
wilsab30
committed
1d3b158
Added gems
wilsab30
committed
1ccbf24
logout button not routing correctly but showing when it's supposed to
miriam-cortes
committed
13ad3dc
gemfile for heroku
miriam-cortes
committed
b976468
gemfile lock
miriam-cortes
committed
52042a2
gemfile, wtf
miriam-cortes
committed
db2ade4
I hate the gemfile
miriam-cortes
committed
f7635db
I hate my life
miriam-cortes
committed
c64e15d
wtf git, SERIOUSLY
miriam-cortes
committed
4382ffa
thank god for TAs
miriam-cortes
committed
19c90eb
please, PLEASEEEEE
miriam-cortes
committed
bdae86d
updated routes so products are nested in merchants
ninamutty
committed
5df596f
Merge branch 'master' into merchant_show_and_edit
miriam-cortes
committed
cce55f8
please go to my branch
miriam-cortes
committed
f52e406
logout working
miriam-cortes
committed
074ecdb
added so user can only add new category if logged in
OLegge
committed
cb52286
merchant models added
miriam-cortes
committed
4b3ffe7
edited seed file headers and nested routes
ninamutty
committed
b75b788
Merge pull request #14 from miriam-cortes/categories
miriam-cortes
authored
2eefa1c
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes
committed
6539d78
Merge branch 'master' into products
ninamutty
committed
24df4a9
fixed merge conflict
wilsab30
committed
087882a
merge conflicts fixed
miriam-cortes
committed
2878149
Merge pull request #16 from miriam-cortes/merchant_show_and_edit
ninamutty
authored
76ce19b
Merge branch 'master' of https://github.com/miriam-cortes/betsy
wilsab30
committed
6f9e3a0
Fixed merge conflict
wilsab30
committed
87990f4
merged miriam's
ninamutty
committed
9cf075f
Update products_controller.rb
ninamutty
authored
499b839
Update show.html.erb
ninamutty
authored
6948955
Update show.html.erb
miriam-cortes
authored
122e748
Update application_controller.rb
ninamutty
authored
d21ba01
Update index.html.erb
miriam-cortes
authored
83e504b
Update show.html.erb
ninamutty
authored
ebcfbdd
Merge pull request #17 from miriam-cortes/products
miriam-cortes
authored
d989f51
Merge branch 'master' of https://github.com/miriam-cortes/betsy
wilsab30
committed
bfc74aa
Fixed merge conflict
wilsab30
committed
6b5bb6a

Commits on Oct 22, 2016

Commits on Oct 24, 2016

commented out pg gem
ninamutty
committed
e812f04
new review stars to dropdown and merchant can't review their own product'
ninamutty
committed
bd7f6bc
login and out not working on heroku
miriam-cortes
committed
2beac8d
rescue thing
miriam-cortes
committed
99800f0
going to have to de-seed when we get ready for heroku
miriam-cortes
committed
07a0583
updated price to type in a float
ninamutty
committed
962019b
basic nav bar
OLegge
committed
93f6681
added foundation gem
OLegge
committed
39407c3
merchant's categories button redirecting correctly
miriam-cortes
committed
a2fcce4
merchant's categories button redirecting correctly
miriam-cortes
committed
7c596f8
changed category routes
OLegge
committed
42eacbf
Merge pull request #19 from miriam-cortes/products
miriam-cortes
authored
ec42c33
Merge branch 'master' into navigation
OLegge
committed
4877023
Merge pull request #20 from miriam-cortes/login
ninamutty
authored
7758920
fixed merge conflicts
OLegge
committed
2e6c01e
Merge pull request #22 from miriam-cortes/navigation
ninamutty
authored
cbc2200

Commits on Oct 25, 2016

trying to fix heroku id stuff, and session tests
miriam-cortes
committed
8c35da2
can add categories to a product
OLegge
committed
7ca50a2
added back to all categories button
OLegge
committed
6fcb506
added foundation gem
ninamutty
committed
920eb55
add to cart method and helper methods
wilsab30
committed
5fc863d
working on fixing delete review button
ninamutty
committed
49df859
fixing paths in tests after nesting products in merchants
ninamutty
committed
a9f8a4e
Merge pull request #23 from miriam-cortes/SessionsController
miriam-cortes
authored
096a9b1
adding to checkout master:
ninamutty
committed
59c557f
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
d457a77
merchant oAuth tests and simplecov addition
miriam-cortes
committed
37b63e2
merchant test incomplete
miriam-cortes
committed
eb7f217
fixed merge conflicts with Sabrinas version
miriam-cortes
committed
1954169
error message if category already exists
OLegge
committed
5bb093a
tests working again - yay
ninamutty
committed
b2874a9
Able to add new order.
wilsab30
committed
40d8efc

Commits on Oct 26, 2016

Added view cart.
wilsab30
committed
34d6fe4
Added table to view cart page
wilsab30
committed
d5903f7
added product assets
ninamutty
committed
45db45e
made changes to view cart.
wilsab30
committed
51902dc
coverage and tests for merchant model
miriam-cortes
committed
3437410
gemfile changed from weird merge
miriam-cortes
committed
3a8ff98
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
8cb4814
Merge branch 'master' into SessionsController
wilsab30
committed
b200196
Merge branch 'master' into products
ninamutty
committed
eed9597
resolve merge conflicts
OLegge
committed
e162412
seeds file uncommented and gemfile cleaned up
miriam-cortes
committed
5bd1d5c
commented out pg on gemfile
OLegge
committed
aab338e
Merge pull request #26 from miriam-cortes/SessionsController
ninamutty
authored
bc5ce56
Merge branch 'master' into merchant_tests
miriam-cortes
committed
67a10a7
commented out pg gem
ninamutty
committed
86b33f1
deleted skooter picture asset
ninamutty
committed
b3bb212
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
2ce6f22
Merge branch 'master' into products
ninamutty
committed
7725936
Merge pull request #28 from miriam-cortes/navigation
ninamutty
authored
ed4ae74
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
8f87de0
merge conflict in gemfile
miriam-cortes
committed
1248e1a
merged master
ninamutty
committed
607f812
path to merchant product in merchant show page
miriam-cortes
committed
442b48c
updated path
ninamutty
committed
a2ea080
Merge pull request #29 from miriam-cortes/products
livmaria7891
authored
f299900
Fixed merge conflict.
wilsab30
committed
b54f885
merge conflicts resolved
miriam-cortes
committed
00325e5
ignore coverage stuffs
miriam-cortes
committed
d79d2da
Merge pull request #31 from miriam-cortes/merchant_tests
miriam-cortes
authored
1e00084
fixed merge conflict
wilsab30
committed
1171878
creading landing index page
ninamutty
committed
2be1f37
Delete index.html
miriam-cortes
authored
6300c56
Delete .last_run.json
miriam-cortes
authored
ee44557
Delete .resultset.json
miriam-cortes
authored
42d3d0d
Delete .resultset.json.lock
miriam-cortes
authored
f390fd8
Delete magnify.png
miriam-cortes
authored
dc80062
Delete loading.gif
miriam-cortes
authored
85053ff
Delete favicon_yellow.png
miriam-cortes
authored
7cda419
Delete favicon_red.png
miriam-cortes
authored
e32d58c
Delete favicon_green.png
miriam-cortes
authored
2a7b7ed
Delete application.js
miriam-cortes
authored
04a788b
Delete application.css
miriam-cortes
authored
68ed32c
Delete ui-bg_flat_0_aaaaaa_40x100.png
miriam-cortes
authored
9a3b3fc
removed coverage file
miriam-cortes
committed
3915aeb
Delete ui-bg_flat_75_ffffff_40x100.png
miriam-cortes
authored
d1936c8
Delete ui-bg_glass_55_fbf9ee_1x400.png
miriam-cortes
authored
c5e83e8
Delete ui-bg_glass_65_ffffff_1x400.png
miriam-cortes
authored
868c03d
Delete ui-bg_glass_75_dadada_1x400.png
miriam-cortes
authored
42be2cf
Delete ui-bg_glass_75_e6e6e6_1x400.png
miriam-cortes
authored
babf61d
Delete ui-bg_glass_95_fef1ec_1x400.png
miriam-cortes
authored
2f79f80
Delete ui-bg_highlight-soft_75_cccccc_1x100.png
miriam-cortes
authored
293b85b
Delete ui-icons_222222_256x240.png
miriam-cortes
authored
149e076
Delete ui-icons_2e83ff_256x240.png
miriam-cortes
authored
c23536c
Delete ui-icons_454545_256x240.png
miriam-cortes
authored
00a9792
Delete ui-icons_888888_256x240.png
miriam-cortes
authored
1d18ef6
Delete ui-icons_cd0a0a_256x240.png
miriam-cortes
authored
3c1f54e
Delete border.png
miriam-cortes
authored
94630ff
Delete controls.png
miriam-cortes
authored
21b9b3a
Delete loading.gif
miriam-cortes
authored
ab34aa6
Delete loading_background.png
miriam-cortes
authored
188ac2a
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes
committed
b2764d8
Add remove item from cart.
wilsab30
committed
92372d0

Commits on Oct 27, 2016

Added subtotal and order total to cart.
wilsab30
committed
ca6a132
Fix link issue and add update qty.
wilsab30
committed
4061e78
Merge pull request #33 from miriam-cortes/SessionsController
miriam-cortes
authored
139d962
logo added
miriam-cortes
committed
26af941
Merge branch 'master' of https://github.com/miriam-cortes/betsy
miriam-cortes
committed
e83760d
added foundation layout grid styling
ninamutty
committed
234f746
Merge branch 'master' into merchant_tests
miriam-cortes
committed
96d54f1
Merge branch 'master' into styling
ninamutty
committed
20fdd5b
Merge pull request #34 from miriam-cortes/merchant_tests
ninamutty
authored
5e42f06
Merge branch 'master' into styling
ninamutty
committed
e1d0a24
Merge pull request #35 from miriam-cortes/styling
miriam-cortes
authored
9af525e
merchant show page correctly listing orders placed TO them
miriam-cortes
committed
bea5db6
used number_to_currency for merchant revenues and fix cart amounts to properly take in pennies prices
miriam-cortes
committed
01f8439
order status showing
miriam-cortes
committed
ac499ee
removed link on order number bc it was routing to a cart
miriam-cortes
committed
20021e9
Added checkout page.
wilsab30
committed
bbbdff7
Lots of seeds
OLegge
committed
4d066ff
Updated update page to say order complete.
wilsab30
committed
14659b5
Merge pull request #37 from miriam-cortes/seeding
miriam-cortes
authored
45a085a
more styles
miriam-cortes
committed
e1215c6
Merge branch 'master' into merchant_styles
miriam-cortes
committed
0d1eb0f
Merge branch 'master' into checkout
wilsab30
committed
e372e88
header styling...not done yet
ninamutty
committed
c89365c
deleted headers
ninamutty
committed
4353faa
removed header
OLegge
committed
0029242
deleted first line of Olivia's csv
miriam-cortes
committed
ed23002
Merge branch 'master' into styling
ninamutty
committed
9ad2f35
Update orders_controller.rb
miriam-cortes
authored
29b51b7
Merge pull request #38 from miriam-cortes/checkout
miriam-cortes
authored
7ef2d0d
Merge branch 'master' into merchant_styles
miriam-cortes
committed
5416857
Merge branch 'master' into checkout
wilsab30
committed
6c7cc19
edited dropdown - will edit more
ninamutty
committed
5905a99
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
5001546
Merge branch 'master' into styling
ninamutty
committed
cf2fd9b
Merge pull request #39 from miriam-cortes/merchant_styles
ninamutty
authored
5dd033a
Merge branch 'master' of https://github.com/miriam-cortes/betsy
ninamutty
committed
2b82c02
Merge branch 'master' into checkout
wilsab30
committed
b1b0fa8
fixed merged conflict
ninamutty
committed
5b7cad6
Merge pull request #40 from miriam-cortes/styling
miriam-cortes
authored
bacb0e8
Merge branch 'master' into checkout
wilsab30
committed
a806d89
pg uncommented for heroku
miriam-cortes
committed
321b78d

Commits on Oct 28, 2016

heroku crap
miriam-cortes
committed
7b74810
uncommented things in Gemfile for Olivia and Nina
miriam-cortes
committed
7562340
landing styling
ninamutty
committed
33be154
styled merchants page
miriam-cortes
committed
dfd2363
took out basic display route thing
miriam-cortes
committed
b009ed7
deleted unnecessary css
miriam-cortes
committed
d37982e
added footer
ninamutty
committed
e6c0a6a
capital first letters on order statuses
miriam-cortes
committed
82fa45d
more button styled
miriam-cortes
committed
8d06a58
products and reviews styling
ninamutty
committed
d3ffb7f
Merge pull request #41 from miriam-cortes/merchant_styles
ninamutty
authored
3de23a1
seeds and tests
OLegge
committed
fd30ca3
Merge branch 'master' into styling
ninamutty
committed
34d954d
Merge branch 'master' into checkout
wilsab30
committed
b124441
Merge pull request #42 from miriam-cortes/styling
miriam-cortes
authored
42be609
Merge branch 'master' into checkout
wilsab30
committed
cebf3cf
Merge pull request #43 from miriam-cortes/seeding
miriam-cortes
authored
97d0354
Merge branch 'master' into checkout
wilsab30
committed
c0a9448
heroku gemfile updates
miriam-cortes
committed
219b808
more styled buttons and link in the logo
miriam-cortes
committed
735ffe9
gemfile modified for ya
miriam-cortes
committed
418e68d
Added langauge to confirmation page.
wilsab30
committed
7af4df6
STYLING
ninamutty
committed
afd5b20
Merge pull request #44 from miriam-cortes/more_styles
miriam-cortes
authored
767aa99
Merge branch 'master' into styling
ninamutty
committed
a300713
added pictures and more seeds
OLegge
committed
8f63e4d
fixed merege.
wilsab30
committed
163ea63
Merge branch 'master' into seeding
OLegge
committed
1afdb42
Merge pull request #45 from miriam-cortes/styling
miriam-cortes
authored
9a0fe2d
handled csv merge conflict
OLegge
committed
29b8095
fixed merge.
wilsab30
committed
7a8a9f8
Merge pull request #46 from miriam-cortes/seeding
miriam-cortes
authored
8da5937
Merge branch 'master' into checkout
wilsab30
committed
684a7d7
Merge pull request #47 from miriam-cortes/checkout
miriam-cortes
authored
995c1b1
edited wedding ring csv
ninamutty
committed
b9275ca
Merge branch 'master' into styling
ninamutty
committed
ada82e4
Gemfile for heroku
miriam-cortes
committed
ee47cf9
for heroku
miriam-cortes
committed
3b62a90
reviews 6-9
ninamutty
committed
5de78ed
reviews added
miriam-cortes
committed
2a87ebb
purchased orders vs customer orders
miriam-cortes
committed
edab648
Olivia's changes
miriam-cortes
committed
10f3b85
Merge pull request #49 from miriam-cortes/reviews
miriam-cortes
authored
a9dd3ba
seeds fixed
ninamutty
committed
9baf840
Merge pull request #50 from miriam-cortes/styling
miriam-cortes
authored
68ea06d
gemfile for heroku
miriam-cortes
committed
ade6ce5
seeds
miriam-cortes
committed
cb85654
checkout button
miriam-cortes
committed
ac5b16d