Code

Don't merge -review#71

Code

Open

stevecass wants to merge 164 commits intorevb2kristiechow/codetribute:revb2from sc-rev2kristiechow/codetribute:sc-rev2Copy head branch name to clipboard

+3,386-83

Commits

Commits on Feb 18, 2016

• Add migrations, models, & initial associations with validations

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  3174414

  Copy full SHA for 3174414

• Complete associations and routes

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  5b4ac66

  Copy full SHA for 5b4ac66

• Merge pull request #1 from kristiechow/migrations-models

  Show description for 27c48cb
  kristiechow

  committed
  27c48cb

  Copy full SHA for 27c48cb

• Minor correction in routes file and add gem pub chat

  

  Kerry Imai

  committed
  a0484fe

  Copy full SHA for a0484fe

• Merge pull request #2 from kristiechow/presetupgems

  Show description for e5246f8
  

  Kerry Imai

  committed
  e5246f8

  Copy full SHA for e5246f8

• Add businesses index & show pages

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  353a38d

  Copy full SHA for 353a38d

• Merge branch 'master' into businesses-index-show

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  72fc968

  Copy full SHA for 72fc968

• set up controller for message, view show page for user

  

  Kerry Imai

  committed
  d65adac

  Copy full SHA for d65adac

• Merge pull request #3 from kristiechow/message1

  Show description for 887918a
  

  Kerry Imai

  committed
  887918a

  Copy full SHA for 887918a

• Create business show page

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  4841e91

  Copy full SHA for 4841e91

• complete create message form and routes

  

  Kerry Imai

  committed
  54288fe

  Copy full SHA for 54288fe

• Update businesses index page

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  5ecb9c2

  Copy full SHA for 5ecb9c2

• Merge pull request #4 from kristiechow/message2

  Show description for 349ad65
  

  Kerry Imai

  committed
  349ad65

  Copy full SHA for 349ad65

• Merge pull request #5 from kristiechow/businesses-index-show

  Show description for 3434867
  

  Kerry Imai

  committed
  3434867

  Copy full SHA for 3434867

• Minor fix on file names in controller

  

  Kerry Imai

  committed
  bf4ba6a

  Copy full SHA for bf4ba6a

• add conversation table and model

  

  Kerry Imai

  committed
  907eb4c

  Copy full SHA for 907eb4c

• Developers and owners models, migrations, associations, controllers, partial views

  kristiechow

  committed
  b2903a8

  Copy full SHA for b2903a8

• fix merge conflict

  kristiechow

  committed
  55dcd17

  Copy full SHA for 55dcd17

• Merge pull request #6 from kristiechow/messagenew

  Show description for 7674487
  kristiechow

  committed
  7674487

  Copy full SHA for 7674487

• add files for message and conversation

  

  Kerry Imai

  committed
  5a398b4

  Copy full SHA for 5a398b4

• Merge pull request #8 from kristiechow/message3

  Show description for 4565efd
  

  Kerry Imai

  committed
  4565efd

  Copy full SHA for 4565efd

• change route rb for conversation and messages

  

  Kerry Imai

  committed
  e109118

  Copy full SHA for e109118

• Merge pull request #9 from kristiechow/message3

  Show description for 3ef9abc
  

  Kerry Imai

  committed
  3ef9abc

  Copy full SHA for 3ef9abc

Commits on Feb 19, 2016

• Convert to single table inheritance

  kristiechow

  committed
  63f4256

  Copy full SHA for 63f4256

• Merge pull request #11 from kristiechow/kc-single-table-inheritance

  Show description for 95cc50a
  kristiechow

  committed
  95cc50a

  Copy full SHA for 95cc50a

• add logged in method to helper

  

  Kerry Imai

  committed
  fb54736

  Copy full SHA for fb54736

• Merge pull request #12 from kristiechow/message4

  Show description for 06975ba
  

  Kerry Imai

  committed
  06975ba

  Copy full SHA for 06975ba

• Fix schema conflict

  kristiechow

  committed
  d091aac

  Copy full SHA for d091aac

• Fix sessions log in location

  kristiechow

  committed
  2aa3310

  Copy full SHA for 2aa3310

• Merge pull request #14 from kristiechow/kc-rectify-user-schema-conflict

  Show description for 74c3675
  kristiechow

  committed
  74c3675

  Copy full SHA for 74c3675

• Update users routes for register

  kristiechow

  committed
  94a24f7

  Copy full SHA for 94a24f7

• Merge pull request #15 from kristiechow/kc-update-user-register

  Show description for 5903985
  kristiechow

  committed
  5903985

  Copy full SHA for 5903985

• Update developers controllers for update form

  kristiechow

  committed
  d8a7a91

  Copy full SHA for d8a7a91

• Merge pull request #16 from kristiechow/kc-edit-forms-developers

  Show description for 855c1e3
  kristiechow

  committed
  855c1e3

  Copy full SHA for 855c1e3

• start message developement

  

  Kerry Imai

  committed
  ce6f7e1

  Copy full SHA for ce6f7e1

• Merge pull request #17 from kristiechow/message6

  Show description for c37e0df
  

  Kerry Imai

  committed
  c37e0df

  Copy full SHA for c37e0df

• Initial setup for photos

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  501a380

  Copy full SHA for 501a380

• Create photos controller, modify routes & photo model

  

  Jenna Espezua & Kerry Imai & Kristie Chow

  committed
  05fd91c

  Copy full SHA for 05fd91c

• Merge pull request #18 from kristiechow/image-model

  Show description for 8b3e817
  espezua

  committed
  8b3e817

  Copy full SHA for 8b3e817

• seed developers and owners

  

  Kerry Imai

  committed
  3de84e6

  Copy full SHA for 3de84e6

• Merge pull request #19 from kristiechow/message7

  Show description for df17554
  

  Kerry Imai

  committed
  df17554

  Copy full SHA for df17554

• Fix merge conflict in developer show

  kristiechow

  committed
  83f4963

  Copy full SHA for 83f4963

• Merge pull request #21 from kristiechow/kc-about-branch-conflict-fix

  Show description for 4439cc8
  kristiechow

  committed
  4439cc8

  Copy full SHA for 4439cc8

• Update about page in routes

  kristiechow

  committed
  0d47361

  Copy full SHA for 0d47361

• Merge pull request #22 from kristiechow/kc-amazon-gem

  Show description for 1062fca
  kristiechow

  committed
  1062fca

  Copy full SHA for 1062fca

• Use new message system

  

  Kerry Imai

  committed
  01486f3

  Copy full SHA for 01486f3

• Merge pull request #23 from kristiechow/message9

  Show description for 244e01b
  

  Kerry Imai

  committed
  244e01b

  Copy full SHA for 244e01b

• Add controllers and edit show

  kristiechow

  committed
  63e3f0d

  Copy full SHA for 63e3f0d

• Merge pull request #24 from kristiechow/kc-business-new-edit

  Show description for cf9353e
  kristiechow

  committed
  cf9353e

  Copy full SHA for cf9353e

• Add show page for business new/create

  kristiechow

  committed
  a896f07

  Copy full SHA for a896f07

• Merge pull request #25 from kristiechow/kc-business-new-page

  Show description for b3f1571
  kristiechow

  committed
  b3f1571

  Copy full SHA for b3f1571

• add changes to login

  

  Kerry Imai

  committed
  67b0708

  Copy full SHA for 67b0708

• Merge pull request #26 from kristiechow/message9

  Show description for bbf2c42
  

  Kerry Imai

  committed
  bbf2c42

  Copy full SHA for bbf2c42

• Complete about view

  kristiechow

  committed
  7190d8f

  Copy full SHA for 7190d8f

• Merge pull request #27 from kristiechow/kc-create-about-page

  Show description for 862d460
  kristiechow

  committed
  862d460

  Copy full SHA for 862d460

• Fix merge conflict in businesses controller

  espezua

  committed
  b797038

  Copy full SHA for b797038

• Fix merge conflict in businesses controller

  espezua

  committed
  a6a7bd8

  Copy full SHA for a6a7bd8

• Update image validations, creating users, and developers show page for images

  espezua

  committed
  53e270d

  Copy full SHA for 53e270d

• Merge pull request #28 from kristiechow/images-paperclip

  Show description for ef5c995
  espezua

  committed
  ef5c995

  Copy full SHA for ef5c995

• private pub not working

  

  Kerry Imai

  committed
  e32dd16

  Copy full SHA for e32dd16

• complete message real time function

  

  Kerry Imai

  committed
  03fec40

  Copy full SHA for 03fec40

• Merge pull request #29 from kristiechow/owner1

  Show description for bc18876
  

  Kerry Imai

  committed
  bc18876

  Copy full SHA for bc18876

• Create omniauth authentication to near completion

  

  Kristie Chow

  committed
  bcdcdd2

  Copy full SHA for bcdcdd2

• Merge pull request #30 from kristiechow/kc-omni-start

  Show description for aa87b88
  kristiechow

  committed
  aa87b88

  Copy full SHA for aa87b88

• Add review functions, association between user and review not working

  

  Kerry Imai

  committed
  e754d8b

  Copy full SHA for e754d8b

• Merge pull request #31 from kristiechow/business

  Show description for b2936b8
  

  Kerry Imai

  committed
  b2936b8

  Copy full SHA for b2936b8

• Update new business form to add multiple images

  espezua

  committed
  42213e1

  Copy full SHA for 42213e1

• Update businesses for photos

  espezua

  committed
  28ae9ee

  Copy full SHA for 28ae9ee

• Merge pull request #32 from kristiechow/images-paperclip

  Show description for 6662c86
  espezua

  committed
  6662c86

  Copy full SHA for 6662c86

• Working facebook OAuth login

  kristiechow

  committed
  6dd5a99

  Copy full SHA for 6dd5a99

• Merge pull request #33 from kristiechow/kc-omni-finish

  Show description for b8d9b7e
  kristiechow

  committed
  b8d9b7e

  Copy full SHA for b8d9b7e

Commits on Feb 20, 2016

• Add normalize.css file to assets in vendor

  kristiechow

  committed
  8a2f103

  Copy full SHA for 8a2f103

• Merge pull request #34 from kristiechow/kc-normalize-css-addd

  Show description for ca8fa43
  kristiechow

  committed
  ca8fa43

  Copy full SHA for ca8fa43

• Remove comments and whitespace from normalize file

  kristiechow

  committed
  36c1a94

  Copy full SHA for 36c1a94

• Merge pull request #35 from kristiechow/kc-normalize-css-addd

  Show description for 4287e07
  kristiechow

  committed
  4287e07

  Copy full SHA for 4287e07

• Initial css styling of body and button

  kristiechow

  committed
  3186f06

  Copy full SHA for 3186f06

• Merge pull request #36 from kristiechow/kc-initial-application-css

  Show description for 5de372a
  kristiechow

  committed
  5de372a

  Copy full SHA for 5de372a

• Update CSS files and business edit page to include photos

  espezua

  committed
  74c355c

  Copy full SHA for 74c355c

• Update seeds file to create unique uid

  espezua

  committed
  ef25662

  Copy full SHA for ef25662

• Merge pull request #37 from kristiechow/business-edit-update

  Show description for c463077
  espezua

  committed
  c463077

  Copy full SHA for c463077

• Update seeds, omniauth, and developers show

  espezua

  committed
  bf70fca

  Copy full SHA for bf70fca

• Complete logic for editing pages and show an avatar

  espezua

  committed
  52c0b5a

  Copy full SHA for 52c0b5a

• Merge pull request #38 from kristiechow/business-edit-update

  Show description for 3abc12a
  espezua

  committed
  3abc12a

  Copy full SHA for 3abc12a

• Add migrations, models, and associations for developer skills

  espezua

  committed
  7fd9a47

  Copy full SHA for 7fd9a47

• Merge pull request #39 from kristiechow/developer-skills-search-bar

  Show description for 2ac1522
  espezua

  committed
  2ac1522

  Copy full SHA for 2ac1522

• Modify migrations and controllers for user registration with & without omniauth

  espezua

  committed
  128bfc5

  Copy full SHA for 128bfc5

• Merge pull request #40 from kristiechow/developer-skills-search-bar

  Show description for 5b1fc11
  espezua

  committed
  5b1fc11

  Copy full SHA for 5b1fc11

• Add migrations and models for business categories

  espezua

  committed
  f6ba465

  Copy full SHA for f6ba465

• Merge pull request #41 from kristiechow/business-categories-search

  Show description for de9b4ac
  espezua

  committed
  de9b4ac

  Copy full SHA for de9b4ac

• Update business categories and developer skills

  espezua

  committed
  3883458

  Copy full SHA for 3883458

Commits on Feb 21, 2016

• Update business to add categories, not working yet

  espezua

  committed
  c07acbc

  Copy full SHA for c07acbc

• Merge pull request #42 from kristiechow/business-categories-search

  Show description for e86862c
  espezua

  committed
  e86862c

  Copy full SHA for e86862c

• Initial maps work

  kristiechow

  committed
  da0d3f0

  Copy full SHA for da0d3f0

• Add business seed

  kristiechow

  committed
  62d581c

  Copy full SHA for 62d581c

• Test css commit

  kristiechow

  committed
  270920b

  Copy full SHA for 270920b

• Add colors and alignment to links and modify search bar styling

  kristiechow

  committed
  5019f55

  Copy full SHA for 5019f55

• Merge pull request #43 from kristiechow/kc-css-colors-alignment

  Show description for 0c8681e
  kristiechow

  committed
  0c8681e

  Copy full SHA for 0c8681e

• Add basic google maps js and html

  kristiechow

  committed
  f908a39

  Copy full SHA for f908a39

• Fix bug

  kristiechow

  committed
  a023f5a

  Copy full SHA for a023f5a

• Working google maps api with gem

  kristiechow

  committed
  facb069

  Copy full SHA for facb069

• Merge pull request #44 from kristiechow/kc-more-google-maps-api

  Show description for 7b9a3c3
  kristiechow

  committed
  7b9a3c3

  Copy full SHA for 7b9a3c3

• Update seeds and business model to fix editing link

  espezua

  committed
  2e35b7a

  Copy full SHA for 2e35b7a

• Fix business categories relationships, spelling, and associations

  espezua

  committed
  bc39a0f

  Copy full SHA for bc39a0f

• Merge pull request #45 from kristiechow/business-categories

  Show description for ef5b172
  espezua

  committed
  ef5b172

  Copy full SHA for ef5b172

• Update CSS styles for forms

  espezua

  committed
  c90a382

  Copy full SHA for c90a382

• Update CSS styles for forms

  espezua

  committed
  08ee748

  Copy full SHA for 08ee748

• Merge pull request #46 from kristiechow/css-forms

  Show description for 198891d
  espezua

  committed
  198891d

  Copy full SHA for 198891d

• change in review files

  

  Kerry Imai

  committed
  00667c6

  Copy full SHA for 00667c6

• Merge pull request #47 from kristiechow/review3

  Show description for 858ee78
  

  Kerry Imai

  committed
  858ee78

  Copy full SHA for 858ee78

• Update CSS for sticky footer

  espezua

  committed
  c79337c

  Copy full SHA for c79337c

• Merge pull request #48 from kristiechow/css-forms

  Show description for 07e1e87
  espezua

  committed
  07e1e87

  Copy full SHA for 07e1e87

• Add github and facebook login buttons

  kristiechow

  committed
  a7bff73

  Copy full SHA for a7bff73

• Add github and facebook login buttons on login

  kristiechow

  committed
  f073e6c

  Copy full SHA for f073e6c

• Merge pull request #49 from kristiechow/kc-github-facebook-icon

  Show description for 201aa49
  kristiechow

  committed
  201aa49

  Copy full SHA for 201aa49

• Update seeds

  espezua

  committed
  d97d90b

  Copy full SHA for d97d90b

• Merge branch 'master' of https://github.com/kristiechow/build-my-business

  espezua

  committed
  1946605

  Copy full SHA for 1946605

• Fix styling with login and register buttons

  kristiechow

  committed
  1784b90

  Copy full SHA for 1784b90

• Merge pull request #50 from kristiechow/kc-github-facebook-icon

  Show description for bfd5a2d
  kristiechow

  committed
  bfd5a2d

  Copy full SHA for bfd5a2d

• Merge branch 'master' of https://github.com/kristiechow/build-my-business

  espezua

  committed
  4367eab

  Copy full SHA for 4367eab

• complete review star rating and display

  

  Kerry Imai

  committed
  b67063e

  Copy full SHA for b67063e

• Merge pull request #51 from kristiechow/review6

  Show description for 0e94138
  

  Kerry Imai

  committed
  0e94138

  Copy full SHA for 0e94138

• Merge branch 'master' of https://github.com/kristiechow/build-my-business

  espezua

  committed
  ae927c9

  Copy full SHA for ae927c9

• Update schema and image of schema

  espezua

  committed
  5f929f6

  Copy full SHA for 5f929f6

• Merge pull request #52 from kristiechow/schema-pic

  Show description for f02a124
  espezua

  committed
  f02a124

  Copy full SHA for f02a124

• Functioning owner/developer separation for omniauth registration

  kristiechow

  committed
  96e0f83

  Copy full SHA for 96e0f83

• Merge pull request #53 from kristiechow/kc-status-update-migration

  Show description for 436d0c4
  kristiechow

  committed
  436d0c4

  Copy full SHA for 436d0c4

• minor fix messsage system

  

  Kerry Imai

  committed
  4d499af

  Copy full SHA for 4d499af

• Merge pull request #54 from kristiechow/review6

  Show description for cb89bf9
  

  Kerry Imai

  committed
  cb89bf9

  Copy full SHA for cb89bf9

• fix bug

  

  Kerry Imai

  committed
  6cf2b98

  Copy full SHA for 6cf2b98

• Merge pull request #55 from kristiechow/correction

  Show description for 6562140
  

  Kerry Imai

  committed
  6562140

  Copy full SHA for 6562140

• debugged Jennas eww comment

  

  Kerry Imai

  committed
  18f7e34

  Copy full SHA for 18f7e34

• Merge pull request #56 from kristiechow/correction

  Show description for 5a107e3
  

  Kerry Imai

  committed
  5a107e3

  Copy full SHA for 5a107e3

• Update file name

  espezua

  committed
  d2561ff

  Copy full SHA for d2561ff

• Update file name

  espezua

  committed
  461d3b6

  Copy full SHA for 461d3b6

• Update developer's show page for avatar logic

  espezua

  committed
  0f99b14

  Copy full SHA for 0f99b14

• Update class to resize profile pic

  espezua

  committed
  8e5755d

  Copy full SHA for 8e5755d

• Merge pull request #57 from kristiechow/pages-images

  Show description for 1d18139
  espezua

  committed
  1d18139

  Copy full SHA for 1d18139

Commits on Feb 22, 2016

• Set restriction to review

  

  Kerry Imai

  committed
  d980865

  Copy full SHA for d980865

• Update CSS styles for forms

  espezua

  committed
  3088154

  Copy full SHA for 3088154

• Merge pull request #58 from kristiechow/css

  Show description for 1a01bea
  espezua

  committed
  1a01bea

  Copy full SHA for 1a01bea

• Add business seed files

  kristiechow

  committed
  2a5e7af

  Copy full SHA for 2a5e7af

• Merge pull request #59 from kristiechow/kc-modify-seed-file

  Show description for 40a584c
  kristiechow

  committed
  40a584c

  Copy full SHA for 40a584c

• Merge pull request #60 from kristiechow/check

  Show description for 225b875
  

  Kerry Imai

  committed
  225b875

  Copy full SHA for 225b875

• Fix bugs and add status column in business table and start status updates"

  kristiechow

  committed
  575a34e

  Copy full SHA for 575a34e

• Merge pull request #61 from kristiechow/kc-fix-bugs-and-start-status-updates

  Show description for c4ff086
  kristiechow

  committed
  c4ff086

  Copy full SHA for c4ff086

• add matching function

  

  Kerry Imai

  committed
  877e3d3

  Copy full SHA for 877e3d3

• Merge pull request #62 from kristiechow/match1

  Show description for f98e325
  

  Kerry Imai

  committed
  f98e325

  Copy full SHA for f98e325

• Fix merge conflict in seed data

  espezua

  committed
  3b9aa8f

  Copy full SHA for 3b9aa8f

• Update logic for avatar image for auth session & current user

  espezua

  committed
  22e1096

  Copy full SHA for 22e1096

• Update seed data for businesses

  espezua

  committed
  686b290

  Copy full SHA for 686b290

• Complete status update controller

  kristiechow

  committed
  2be090d

  Copy full SHA for 2be090d

• Merge pull request #63 from kristiechow/kc-status-updates

  Show description for e756a93
  kristiechow

  committed
  e756a93

  Copy full SHA for e756a93

• Update seeds for business images

  espezua

  committed
  3fa64ab

  Copy full SHA for 3fa64ab

• Merge pull request #64 from kristiechow/seed-data

  Show description for 87f87e3
  espezua

  committed
  87f87e3

  Copy full SHA for 87f87e3

• Fix sessions controller

  kristiechow

  committed
  39736f5

  Copy full SHA for 39736f5

• Merge pull request #65 from kristiechow/kc-omniauth-redirection

  Show description for 02cd95e
  kristiechow

  committed
  02cd95e

  Copy full SHA for 02cd95e

• Update seeds data

  espezua

  committed
  4573630

  Copy full SHA for 4573630

• Merge pull request #67 from kristiechow/seed-data

  Show description for 008ac12
  espezua

  committed
  008ac12

  Copy full SHA for 008ac12

• Make partials for show pages

  

  Kerry Imai

  committed
  d0350e9

  Copy full SHA for d0350e9

• Merge pull request #68 from kristiechow/match1

  Show description for 7280a3f
  

  Kerry Imai

  committed
  7280a3f

  Copy full SHA for 7280a3f

• Update business model and controller for search bar functionality

  espezua

  committed
  f7932e3

  Copy full SHA for f7932e3

• Merge pull request #69 from kristiechow/search-bar-businesses

  Show description for c223475
  espezua

  committed
  c223475

  Copy full SHA for c223475

• Update seeds and forms for registering/logging in

  espezua

  committed
  e4fa442

  Copy full SHA for e4fa442

• Merge pull request #70 from kristiechow/search-bar-businesses

  Show description for 345b388
  espezua

  committed
  345b388

  Copy full SHA for 345b388