Code

Sarah#25

Code

Open

SarahDellheim wants to merge 127 commits intorevaturelabs:devrevaturelabs/rideshare-user-service:devfrom Batch-697-Adam-Ranieri:SarahBatch-697-Adam-Ranieri/rideshare-user-service:SarahCopy head branch name to clipboard

+15,006-3,824

Commits

Commits on Feb 25, 2020

• should be able to do cucumber stuffs

  

  dmrochon

  committed
  5bfb675

• Merge pull request #1 from Batch-697-Adam-Ranieri/domi

  Show description for 8c9288b
  dmrochon

  authored
  8c9288b

• removed unnecessary documentation per Adam's request

  khairston

  committed
  3caa2f7

• Merge pull request #2 from Batch-697-Adam-Ranieri/fix-documentation

  Show description for 125b780
  khairston

  authored
  125b780

• Added 2 feature files

  Show description for c0d8393
  Aaleyah4d

  committed
  c0d8393

• Merge pull request #3 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for cf3cdb5
  dmrochon

  authored
  cf3cdb5

Commits on Feb 26, 2020

• Added 5 feature files

  SarahShinespark

  committed
  8e66707

• I added Another feature file and edited the ones i did

  Show description for 87f2f05
  Aaleyah4d

  committed
  87f2f05

• Merge pull request #5 from Batch-697-Adam-Ranieri/Sarah

  Show description for c9dcec4
  dmrochon

  authored
  c9dcec4

• Merge pull request #4 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for cd4fa0e
  Aaleyah4d

  authored
  cd4fa0e

• Rename and corrected little errors in the files

  Aaleyah4d

  committed
  e59c70f

• added update car information feature and update membership feature

  

  dmrochon

  committed
  b3dfb24

• Merge pull request #6 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for f10d1e0
  Aaleyah4d

  authored
  f10d1e0

• Merge pull request #7 from Batch-697-Adam-Ranieri/dominique

  Show description for f3dab4b
  anthonylucasmcarthur

  authored
  f3dab4b

• Merge pull request #8 from Batch-697-Adam-Ranieri/dev

  Show description for ccd617d
  WilliamFoltz

  authored
  ccd617d

• Removal of errors

  Show description for 1dceee3
  inamjr

  committed
  1dceee3

• Merge pull request #9 from Batch-697-Adam-Ranieri/origin/Anthony-ike

  Show description for 214cb55
  inamjr

  authored
  214cb55

• commented out user controller test

  Show description for 6eda6a2
  inamjr

  committed
  6eda6a2

• Merge pull request #10 from Batch-697-Adam-Ranieri/origin/Anthony-ike

  Show description for 58b5522
  damienfran

  authored
  58b5522

• Hopeful temp fix to API issues

  Hellorn

  committed
  31dd5bc

• Merge pull request #11 from Batch-697-Adam-Ranieri/apifix

  Show description for 041a456
  WilliamFoltz

  authored
  041a456

• added steps package and a Login Step Class

  

  dmrochon

  committed
  b326383

• Merge pull request #12 from Batch-697-Adam-Ranieri/dominique

  Show description for 26e123b
  dmrochon

  authored
  26e123b

• Um i didnt make changes but is said i did

  Aaleyah4d

  committed
  c235047

Commits on Feb 27, 2020

• I started the steps file

  Aaleyah4d

  committed
  9b46cdb

• Merge branch 'dev' into Aaleyah

  SarahDellheim

  authored
  f9bb296

• Merge pull request #13 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for 3b0c96b
  SarahDellheim

  authored
  3b0c96b

• Merge pull request #14 from Batch-697-Adam-Ranieri/dev

  Show description for dc0aa70
  WilliamFoltz

  authored
  dc0aa70

• changed yaml

  WilliamFoltz

  committed
  b1c5bdb

• Added 3 step files

  SarahShinespark

  committed
  cfd567e

• Added a step and then some work on the Pages.java

  Aaleyah4d

  committed
  f7cd75d

• changed port in yml

  WilliamFoltz

  committed
  3aab864

• Merge pull request #18 from Batch-697-Adam-Ranieri/william

  Show description for 6ed15ed
  inamjr

  authored
  6ed15ed

• Merge pull request #17 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for c6a1812
  Aaleyah4d

  authored
  c6a1812

• created outline for riders page steps and 2 others

  

  dmrochon

  committed
  ab55e08

• Merge branch 'dev' of https://github.com/Batch-697-Adam-Ranieri/rideshare-user-service into Sarah

  SarahShinespark

  committed
  886c294

• Merge pull request #16 from Batch-697-Adam-Ranieri/Sarah

  Show description for 2718d84
  Aaleyah4d

  authored
  2718d84

• Merge pull request #20 from Batch-697-Adam-Ranieri/dominique

  Show description for 8ed59ab
  Aaleyah4d

  authored
  8ed59ab

• Added Documentation for OpenAPI

  Show description for ee7ef19
  khairston

  committed
  ee7ef19

• Merge branch 'dev' into fix-documentation

  khairston

  authored
  2e32612

• Merge pull request #21 from Batch-697-Adam-Ranieri/fix-documentation

  Show description for 4f529b2
  khairston

  authored
  4f529b2

• Added annotations to homepage

  SarahShinespark

  committed
  ee8c963

• Merge pull request #22 from Batch-697-Adam-Ranieri/Sarah

  Show description for 2a28a0e
  Aaleyah4d

  authored
  2a28a0e

• Update CarController.java

  Show description for dca95f1
  jmmancuso4

  committed
  dca95f1

• Added annotations to homepage and step implementation to loginsteps

  SarahShinespark

  committed
  542ec5c

• Merge pull request #23 from Batch-697-Adam-Ranieri/carControllerFix

  Show description for ed09034
  dmrochon

  authored
  ed09034

• Merge pull request #24 from Batch-697-Adam-Ranieri/Sarah

  Show description for cebf84f
  dmrochon

  authored
  cebf84f

• Update DriverRegisterSteps.java

  Aaleyah4d

  committed
  a6bf083

• made local users

  anthonylucasmcarthur

  committed
  168af11

• changes

  anthonylucasmcarthur

  committed
  a7f13a1

• Merge branch 'dev' into making-local-users

  anthonylucasmcarthur

  authored
  60dc44d

• Merge pull request #25 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for 6cfa96b
  SarahDellheim

  authored
  6cfa96b

Commits on Feb 28, 2020

• finished almost all web elements

  

  dmrochon

  committed
  e5c198a

• Update DriverRegisterSteps.java

  Aaleyah4d

  committed
  56aef96

• Merge pull request #27 from Batch-697-Adam-Ranieri/dominique

  Show description for 3d5b5b6
  SarahDellheim

  authored
  3d5b5b6

• Merge pull request #26 from Batch-697-Adam-Ranieri/making-local-users

  Show description for b55ee37
  WilliamFoltz

  authored
  b55ee37

• Merge pull request #28 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for 5ec4060
  WilliamFoltz

  authored
  5ec4060

Commits on Mar 2, 2020

• updated project

  khairston

  committed
  8eeb426

• Merge branch 'dev' into import

  khairston

  committed
  6f01649

• Merge pull request #29 from Batch-697-Adam-Ranieri/import

  Show description for 8c07175
  khairston

  authored
  8c07175

• Fixed Service Deletes

  khairston

  committed
  03d20ab

• Merge pull request #30 from Batch-697-Adam-Ranieri/import

  Show description for 84b2b1d
  rhtydv

  authored
  84b2b1d

• added a simple maven project for test automation

  

  dmrochon

  committed
  e7d00b9

• Merge pull request #31 from Batch-697-Adam-Ranieri/dominique

  Show description for 7d04694
  khairston

  authored
  7d04694

• relocated Documentation

  khairston

  committed
  0269667

• Merge pull request #32 from Batch-697-Adam-Ranieri/import

  Show description for 4d20f1f
  khairston

  authored
  4d20f1f

• solved login/adduser issue

  khairston

  committed
  f4c35dd

• postmapping for login

  khairston

  committed
  21d8de6

• Merge pull request #33 from Batch-697-Adam-Ranieri/import

  Show description for 8dfbb5c
  dmrochon

  authored
  8dfbb5c

• 2nd attempt for the automation project

  

  dmrochon

  committed
  9fce8b0

• Update README.md

  khairston

  authored
  32f15f3

• commented out encryption

  khairston

  committed
  11f534e

• updated readme

  khairston

  committed
  88b526d

• readme

  khairston

  committed
  b985282

• readme

  khairston

  committed
  e9194fc

• Merge pull request #34 from Batch-697-Adam-Ranieri/khairston-patch-1

  Show description for 45a503f
  rhtydv

  authored
  45a503f

• correct yaml file

  khairston

  committed
  14b53c0

• Merge pull request #35 from Batch-697-Adam-Ranieri/khairston-patch-1

  Show description for 3ce40e6
  dmrochon

  authored
  3ce40e6

• Merge branch 'dev' of https://github.com/Batch-697-Adam-Ranieri/rideshare-user-service into dominique

  

  dmrochon

  committed
  a0fe9f8

• Merge pull request #36 from Batch-697-Adam-Ranieri/dominique

  Show description for ec1f538
  khairston

  authored
  ec1f538

• added more to drivers feature

  

  dmrochon

  committed
  27ca1e5

• deleted unused files

  

  dmrochon

  committed
  e812538

• removed useless files

  

  dmrochon

  committed
  8ae0a47

• Merge pull request #37 from Batch-697-Adam-Ranieri/dominique

  Show description for fe97603
  dmrochon

  authored
  fe97603

• New step within backend project

  SarahShinespark

  committed
  d1f0318

• Merge pull request #38 from Batch-697-Adam-Ranieri/Sarah

  Show description for 7f156f8
  Aaleyah4d

  authored
  7f156f8

• deleted the WebElements not used

  

  dmrochon

  committed
  eb9fdcf

• Merge pull request #39 from Batch-697-Adam-Ranieri/dominique

  Show description for a6ece73
  rhtydv

  authored
  a6ece73

• Admin and then some stuffs on the homepage

  Aaleyah4d

  committed
  bd93542

• Merge pull request #40 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for 6696e6e
  SarahDellheim

  authored
  6696e6e

• deleted and added Web elements

  

  dmrochon

  committed
  8acc67c

• added and deleted web elements

  

  dmrochon

  committed
  b913231

• added feature and web elements

  

  dmrochon

  committed
  da7849a

Commits on Mar 3, 2020

• modified driver feature file and added web elements to hompage class

  

  dmrochon

  committed
  ccf0bd6

• Merge pull request #41 from Batch-697-Adam-Ranieri/dominique

  Show description for d879291
  khairston

  authored
  d879291

• Postman test

  WaluigiPR

  committed
  f295420

• Postman at documentation

  WaluigiPR

  committed
  3a1d8ee

• Merge pull request #42 from Batch-697-Adam-Ranieri/eliezer

  Show description for ed02f2a
  rhtydv

  authored
  ed02f2a

• Added rider steps for now

  SarahShinespark

  committed
  b61e965

• logging added

  rhtydv

  committed
  16c2f4f

• Merge pull request #44 from Batch-697-Adam-Ranieri/Logging

  Show description for 25f9a52
  anthonylucasmcarthur

  authored
  25f9a52

• Added Admin steps and changed some of the admin feature file

  Aaleyah4d

  committed
  52eb7eb

• Merge pull request #43 from Batch-697-Adam-Ranieri/Sarah

  Show description for 5fbd22b
  dmrochon

  authored
  5fbd22b

• Merge pull request #45 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for b2dabee
  SarahDellheim

  authored
  b2dabee

• created steps for driver

  

  dmrochon

  committed
  a356e57

• Merge pull request #46 from Batch-697-Adam-Ranieri/dominique

  Show description for 3bd0847
  SarahDellheim

  authored
  3bd0847

Commits on Mar 4, 2020

• Merge pull request #47 from Batch-697-Adam-Ranieri/dev

  Show description for 27f53a6
  Hellorn

  authored
  27f53a6

• Fixed controllers and added GSON dependency to force API key function to work as intended

  Hellorn

  committed
  c9d8f54

• Merge pull request #48 from Batch-697-Adam-Ranieri/apifix

  Show description for 7be4e9f
  reservedmean

  authored
  7be4e9f

Commits on Mar 5, 2020

• unique constraint

  damienfran

  committed
  b989565

• Merge pull request #49 from Batch-697-Adam-Ranieri/unique

  Show description for 6c6ff07
  rhtydv

  authored
  6c6ff07

• Editing home , and everything to do with the admin

  Aaleyah4d

  committed
  7c8f4ce

• Merge pull request #50 from Batch-697-Adam-Ranieri/Aaleyah

  Show description for 0f57702
  damienfran

  authored
  0f57702

• edited driver feature files and steps

  

  dmrochon

  committed
  0e82f49

• fixed admin issues

  

  dmrochon

  committed
  ea2b817

• fixed merge issues

  

  dmrochon

  committed
  bf6ab92

• login function returns null if username cannot be found

  khairston

  committed
  01c56f8

• Merge pull request #52 from Batch-697-Adam-Ranieri/khairston-patch-1

  Show description for 034a04e
  rhtydv

  authored
  034a04e

• Merge pull request #51 from Batch-697-Adam-Ranieri/dominique

  Show description for 82b79cb
  damienfran

  authored
  82b79cb

• finished

  

  Bush Lam

  committed
  bedb6cf

• Merge pull request #54 from Batch-697-Adam-Ranieri/MockController

  Show description for d2df66b
  Sou1Aced

  authored
  d2df66b

• getEmployeeByUsername

  khairston

  committed
  e9eaa4e

• Merge pull request #55 from Batch-697-Adam-Ranieri/khairston-patch-1

  Show description for cc4ef95
  WilliamFoltz

  authored
  cc4ef95

• edited and added web elements

  

  dmrochon

  committed
  7615ffd

Commits on Mar 6, 2020

• Merge pull request #56 from Batch-697-Adam-Ranieri/dominique

  Show description for 8262139
  WilliamFoltz

  authored
  8262139

• Added to rider steps and corrected Homepage office element id

  SarahShinespark

  committed
  d4d804b

• Merge branch 'dev' into Sarah

  Aaleyah4d

  authored
  273d01a