FarMar Complete - #57

Open

BrandiPhillips wants to merge 58 commits into

Ada-C6:masterfrom

BrandiPhillips:master

Commits on Oct 4, 2016

Commits on Oct 5, 2016

Added SessionsController and helper for persistent memory of user identity
eabrash
committed
4ad1d40
Merge pull request #1 from BrandiPhillips/login_testing
eabrash
authored
cc0085c
welcome page links to session selection
BrandiPhillips
committed
b35fa40
Added user index and user show (dropdown not working yet)
eabrash
committed
30315db
Edits to user view - menu
eabrash
committed
d399597
Merging conflicts
eabrash
committed
b8b0b3e
Merge pull request #2 from BrandiPhillips/user_loop
eabrash
authored
f9901d5
Fixed conflict in index of user
eabrash
committed
7164933
fixed user loop
eabrash
committed
05a3153
session creation working
BrandiPhillips
committed
2a6029e

Commits on Oct 6, 2016

working on market index vendor button
BrandiPhillips
committed
46cf725
Added Market loop with basic functionality to create and edit Markets (does not include addition/removal of Vendors from Markets)
eabrash
committed
525385a
Merge pull request #3 from BrandiPhillips/fix_user_loop
eabrash
authored
894199e
Sale and product loops added with basic functionality
eabrash
committed
a74f55e
Merge pull request #4 from BrandiPhillips/sale_and_product_loops
eabrash
authored
6a7aa39
vendor create is functional
BrandiPhillips
committed
b5618e5
Added some dropdowns, DRYed up market forms, small edits to login mechanism
eabrash
committed
ace5c28
DRYed up product forms
eabrash
committed
c7dcfd1
Merge pull request #5 from BrandiPhillips/playing_with_dropdowns
eabrash
authored
7f3e112
vendor delete functional
BrandiPhillips
committed
5c94a45
fixed conflicts
BrandiPhillips
committed
bf6f937
all functionality going
BrandiPhillips
committed
9f4af16
Fixed number of decimal places in sale total
eabrash
committed
ea58ec4

Commits on Oct 7, 2016

Added per-month total to sales show
eabrash
committed
697586a
establishing some styling
BrandiPhillips
committed
eb99d13
Updated Gemfile for Heroku
eabrash
committed
302968b
Trying to fix gemfile issue
eabrash
committed
55fdee4
Removed id read-in from CSVs
eabrash
committed
121f853
main page styling working
BrandiPhillips
committed
c540a08
fixing conflicts
BrandiPhillips
committed
43ac495
Merge branch 'master' of https://github.com/BrandiPhillips/FarMarRails---Emily-and-Brandi
eabrash
committed
1222870
fixed non-displaying sales and products
eabrash
committed
11aa337
Fixed problem with products and sales not displaying
eabrash
committed
963ac07
Added top banner with Vendor or Market name
eabrash
committed
2cb86fd
footers in place
BrandiPhillips
committed
9392876
fixed conflicts
BrandiPhillips
committed
15b56ec
Fixed route for vendors new to be GET not POST
eabrash
committed
1365cda
fixed link in user show page
eabrash
committed
c7b4915
Gating working and problem where user did not reset to Guest fixed
eabrash
committed
b3b3b7d
styling complete
BrandiPhillips
committed
72ebf7b
fixed bugs
BrandiPhillips
committed
074c2d0
conflicts ignored
eabrash
committed
be28436
merged branch with master
eabrash
committed
a471da9
final on Friday
eabrash
committed
05e0cdd
Modified Gemfile
eabrash
committed
8d5fdf9

Commits on Oct 8, 2016

Edited Gemfile.
BrandiPhillips
committed
8c1fdde
Changed Gemfile
eabrash
committed
42221b8
gitignore
eabrash
committed
df29fa0
removed .bundle
eabrash
committed
522be4e
remove permissions
eabrash
committed
79eafd4
remove permissions
eabrash
committed
bc2a3c1
remove permissions2
eabrash
committed
4114602
remove permissions3
eabrash
committed
59c8b7e

Commits on Oct 10, 2016

Merge pull request #7 from eabrash/master
eabrash
authored
e228846