Code

Lucas#78

Code

Open

JankMajesty wants to merge 32 commits intoAustinCodingAcademy:masterAustinCodingAcademy/311_wk5_both_api_hackathon:masterfrom kiffykowboy:lucaskiffykowboy/311_wk5_both_api_hackathon:lucasCopy head branch name to clipboard

+1,478-57

Commits

Commits on Jul 28, 2021

• -

  RamonCruz-Hinojosa

  committed
  39963c7

  Copy full SHA for 39963c7

• changed readme

  Michael-Fares

  committed
  02a49bb

  Copy full SHA for 02a49bb

• added SQL creds

  kc-hrt

  committed
  730b200

  Copy full SHA for 730b200

• merge error

  kc-hrt

  committed
  8adf224

  Copy full SHA for 8adf224

• added express

  Michael-Fares

  committed
  12684f6

  Copy full SHA for 12684f6

• created routes and controllers folders with employees.js file for each

  mayra-tellez

  committed
  2a162b0

  Copy full SHA for 2a162b0

• project inited

  RamonCruz-Hinojosa

  committed
  92335e4

  Copy full SHA for 92335e4

• added export statement to controller file

  mayra-tellez

  committed
  028a483

  Copy full SHA for 028a483

Commits on Jul 29, 2021

• Merge pull request #2 from kiffykowboy/mayra/create-employees-router

  Show description for a6f6765
  TeknoFiend

  authored
  a6f6765

  Copy full SHA for a6f6765

Commits on Jul 30, 2021

• adding controller and route for employee id

  chase-powell

  committed
  b7ae0b4

  Copy full SHA for b7ae0b4

• Merge branch 'master' into Michael-Fares

  Michael-Fares

  authored
  ab216ea

  Copy full SHA for ab216ea

• Merge pull request #1 from kiffykowboy/Michael-Fares

  Show description for 1763d9f
  TeknoFiend

  authored
  1763d9f

  Copy full SHA for 1763d9f

• GET routs for employees

  sammydunn

  committed
  397a7e6

  Copy full SHA for 397a7e6

• Merge branch 'master' into initProject

  TeknoFiend

  authored
  c2e2f86

  Copy full SHA for c2e2f86

• Controller function getEmployees

  sammydunn

  committed
  7e77346

  Copy full SHA for 7e77346

• Merge pull request #3 from kiffykowboy/initProject

  Show description for 99069d6
  TeknoFiend

  authored
  99069d6

  Copy full SHA for 99069d6

• indexjs fixed

  RamonCruz-Hinojosa

  committed
  683e3f5

  Copy full SHA for 683e3f5

• Merge pull request #5 from kiffykowboy/newbranch

  Show description for a915dca
  TeknoFiend

  authored
  a915dca

  Copy full SHA for a915dca

• Merge branch 'master' of https://github.com/kiffykowboy/311_wk5_both_api_hackathon into Sam

  sammydunn

  committed
  de0fa63

  Copy full SHA for de0fa63

• Merge pull request #4 from kiffykowboy/chase-part

  Show description for aa34a07
  TeknoFiend

  authored
  aa34a07

  Copy full SHA for aa34a07

• fixed controller and route for employee by id

  chase-powell

  committed
  43b8743

  Copy full SHA for 43b8743

• added controllers

  slisette127

  committed
  262c28c

  Copy full SHA for 262c28c

• routes for employee by first name

  slisette127

  committed
  f40d8d5

  Copy full SHA for f40d8d5

• pull request credit

  kc-hrt

  committed
  af23db7

  Copy full SHA for af23db7

• fixed caps

  RamonCruz-Hinojosa

  committed
  cf3711c

  Copy full SHA for cf3711c

• router caps fixed

  RamonCruz-Hinojosa

  committed
  e0bb06c

  Copy full SHA for e0bb06c

• Merge branch 'master' into Sam

  TeknoFiend

  authored
  3759204

  Copy full SHA for 3759204

• Merge pull request #6 from kiffykowboy/Sam

  Show description for 14e1442
  TeknoFiend

  authored
  14e1442

  Copy full SHA for 14e1442

• Merge pull request #7 from kiffykowboy/kasey_branch

  Show description for 2f37444
  TeknoFiend

  authored
  2f37444

  Copy full SHA for 2f37444

• Merge branch 'master' into sandra

  TeknoFiend

  authored
  a69d40f

  Copy full SHA for a69d40f

• Merge pull request #8 from kiffykowboy/sandra

  Show description for f26eccb
  TeknoFiend

  authored
  f26eccb

  Copy full SHA for f26eccb

• adding update employee by id

  JankMajesty

  committed
  a7e085a

  Copy full SHA for a7e085a