Code

Klaus#5

Code

Open

klaus2132 wants to merge 94 commits intoStringRolls:mainStringRolls/Project3-server:mainfrom iMentorIronhack:KlausiMentorIronhack/iMentor-server:KlausCopy head branch name to clipboard

+1,381-516

Commits

Commits on May 31, 2022

• fix invertd piramid

  corinaper

  committed
  0b31d2a

Commits on Jun 1, 2022

• WIP

  01000001kuma

  committed
  243cbbd

• changed the env files

  corinaper

  committed
  06935cb

• WIP

  01000001kuma

  committed
  7de6f3c

• user model done

  klaus2132

  committed
  20a8706

• Merge pull request #1 from iMentorIronhack/Klaus

  Show description for 3a2befb
  klaus2132

  authored
  3a2befb

• question model done

  klaus2132

  committed
  9145eae

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Klaus

  klaus2132

  committed
  c460092

• changed coaster to question model

  klaus2132

  committed
  8e2468d

• Merge pull request #2 from iMentorIronhack/Klaus

  Show description for edbd8a9
  klaus2132

  authored
  edbd8a9

• models is done

  klaus2132

  committed
  c77a290

• Merge pull request #3 from iMentorIronhack/Klaus

  Show description for 4e75757
  klaus2132

  authored
  4e75757

• added the routes

  corinaper

  committed
  71c8c4b

• seed added

  

  Alberte Vieites

  committed
  9209fe1

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  345601e

• Merge pull request #4 from iMentorIronhack/Corina

  Show description for a0829c1
  corinaper

  authored
  a0829c1

• Merge pull request #5 from iMentorIronhack/Alberte

  Show description for 5e43de8
  albertevieites

  authored
  5e43de8

• updated the routes

  corinaper

  committed
  fc87f55

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  246322b

• Merge pull request #6 from iMentorIronhack/Corina

  Show description for 004f07c
  corinaper

  authored
  004f07c

• fixed the errors, ready to work on front

  corinaper

  committed
  7e63816

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  340b35a

• Merge pull request #7 from iMentorIronhack/Corina

  Show description for dd70818
  corinaper

  authored
  dd70818

Commits on Jun 2, 2022

• added skills schema and new route

  corinaper

  committed
  408c5ae

• Merge pull request #8 from iMentorIronhack/Corina

  Show description for 388f37c
  corinaper

  authored
  388f37c

• added one more route to skills route

  corinaper

  committed
  f585817

• Merge pull request #9 from iMentorIronhack/Corina

  Show description for 5af68ba
  corinaper

  authored
  5af68ba

• Merge branch 'Adria' of https://github.com/iMentorIronhack/iMentor-server into Adria

  01000001kuma

  committed
  4de9fcb

• Merge remote-tracking branch 'origin/main' into Adria

  01000001kuma

  committed
  38dcd3c

• updated

  corinaper

  committed
  2da6490

• Merge pull request #10 from iMentorIronhack/Corina

  Show description for 75c90af
  corinaper

  authored
  75c90af

• changed the routes

  corinaper

  committed
  b932f8c

• Merge pull request #11 from iMentorIronhack/Corina

  Show description for e646f01
  albertevieites

  authored
  e646f01

• WIP

  01000001kuma

  committed
  a593dd1

• Merge remote-tracking branch 'origin/main' into Adria

  01000001kuma

  committed
  bf1ed90

Commits on Jun 3, 2022

• questions page is working

  klaus2132

  committed
  8fa58df

• changed the schema and routes

  corinaper

  committed
  ddef84b

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  78ee6e5

• WIP

  01000001kuma

  committed
  74c8938

• removeed token from user schema, populated owner

  klaus2132

  committed
  e8f1c8f

• Merge pull request #12 from iMentorIronhack/Corina

  Show description for ce3d5bf
  klaus2132

  authored
  ce3d5bf

• conflict solved

  klaus2132

  committed
  1261fdd

• Merge pull request #13 from iMentorIronhack/Klaus

  Show description for e6004d5
  corinaper

  authored
  e6004d5

• Merge remote-tracking branch 'origin/main' in adri

  01000001kuma

  committed
  6303470

• Merge remote-tracking branch 'origin/main' into Adria

  01000001kuma

  committed
  85391bf

• changed the route to update the profile

  corinaper

  committed
  5f5d447

Commits on Jun 6, 2022

• Merge pull request #14 from iMentorIronhack/Corina

  Show description for cd6a7c5
  klaus2132

  authored
  cd6a7c5

• added the question to the user

  corinaper

  committed
  6acbb92

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  4d25373

• done the question and user connection

  corinaper

  committed
  8f94105

• Merge pull request #15 from iMentorIronhack/Corina

  Show description for b3aee4e
  klaus2132

  authored
  b3aee4e

• WIP on routes

  01000001kuma

  committed
  57e3ae3

• Merge remote-tracking branch 'origin/main' into Adria

  01000001kuma

  committed
  3e1ff28

• Merge pull request #16 from iMentorIronhack/Adria

  Show description for 95906f5
  corinaper

  authored
  95906f5

• changed usertype in schema

  corinaper

  committed
  4c1c165

• Merge pull request #17 from iMentorIronhack/Corina

  Show description for d848113
  klaus2132

  authored
  d848113

• WIP

  corinaper

  committed
  2d9a6e3

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  88daff9

• route to question details fixed

  klaus2132

  committed
  18c20ec

• Merge pull request #19 from iMentorIronhack/Klaus

  Show description for 6701227
  corinaper

  authored
  6701227

Commits on Jun 7, 2022

• Corrected some mistakes in the comment model

  corinaper

  committed
  ffed18d

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  7dc50d1

• Merge pull request #18 from iMentorIronhack/Corina

  Show description for 2c5f4de
  klaus2132

  authored
  2c5f4de

• fixed the delete post

  corinaper

  committed
  f6cdb70

• app works, wip chat

  klaus2132

  committed
  10920ec

• Merge pull request #20 from iMentorIronhack/Klaus

  Show description for 6c41f67
  01000001kuma

  authored
  6c41f67

• fixed the user schema to populate questions

  corinaper

  committed
  46403ba

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  c4d0032

• Merge pull request #21 from iMentorIronhack/Corina

  Show description for 13db4c6
  01000001kuma

  authored
  13db4c6

• added chats to index.routes

  klaus2132

  committed
  d72702d

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Klaus

  klaus2132

  committed
  1d3c1d6

• Merge pull request #22 from iMentorIronhack/Klaus

  Show description for 815834a
  01000001kuma

  authored
  815834a

• added edit question route

  corinaper

  committed
  5b39cf5

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  9f3b859

• Merge pull request #23 from iMentorIronhack/Corina

  Show description for ef5aec0
  01000001kuma

  authored
  ef5aec0

Commits on Jun 8, 2022

• fixed some routings

  corinaper

  committed
  b37eaa9

• Merge pull request #24 from iMentorIronhack/Corina

  Show description for 382abac
  01000001kuma

  authored
  382abac

• chat wip

  klaus2132

  committed
  490f26b

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Klaus

  klaus2132

  committed
  bb965ec

• Merge pull request #25 from iMentorIronhack/Klaus

  Show description for 71159b9
  01000001kuma

  authored
  71159b9

• chat show, but ot with socket.io

  klaus2132

  committed
  9e9419f

• messages

  klaus2132

  committed
  2fae439

• WIP CHAT

  klaus2132

  committed
  871115b

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Klaus

  klaus2132

  committed
  9171b40

• handled errors

  corinaper

  committed
  cbfeb4b

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  7303aa9

• Merge pull request #26 from iMentorIronhack/Klaus

  Show description for e54c9f8
  corinaper

  authored
  e54c9f8

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  9811321

• Merge pull request #27 from iMentorIronhack/Corina

  Show description for 4339a8c
  klaus2132

  authored
  4339a8c

Commits on Jun 9, 2022

• edited seeding files

  corinaper

  committed
  4a93488

• Merge branch 'main' of https://github.com/iMentorIronhack/iMentor-server into Corina

  corinaper

  committed
  96b8a63

• Merge pull request #28 from iMentorIronhack/Corina

  Show description for 4d68a95
  01000001kuma

  authored
  4d68a95

• edited chat

  corinaper

  committed
  bfb6276

• Merge pull request #29 from iMentorIronhack/Corina

  Show description for 82b5421
  klaus2132

  authored
  82b5421