Code

Dev#31

Code

Closed

Ange230700 wants to merge 91 commits intomainDreallers/WildTube:mainfrom devDreallers/WildTube:devCopy head branch name to clipboard

+2,814-651

Commits

Commits on Dec 12, 2023

• j'ai rien compris

  Dreallers

  committed
  fb71b0b

  Copy full SHA for fb71b0b

• Merge branch 'dev' of github.com:Dreallers/WildTube into test

  Dreallers

  committed
  b6b4e9f

  Copy full SHA for b6b4e9f

• cest nul

  Dreallers

  committed
  2bef70d

  Copy full SHA for 2bef70d

• Merge branch 'dev' of github.com:Dreallers/WildTube into test

  Dreallers

  committed
  6aae885

  Copy full SHA for 6aae885

• structure database

  Aurelemeriau

  committed
  c5a99aa

  Copy full SHA for c5a99aa

• Merge pull request #7 from Dreallers/Aurel

  Show description for f766e99
  Aurelemeriau

  authored
  f766e99

  Copy full SHA for f766e99

• working on backend...

  Ange230700

  committed
  cad74ff

  Copy full SHA for cad74ff

• fixing conflicts

  Ange230700

  committed
  cd79618

  Copy full SHA for cd79618

• pending...

  Ange230700

  committed
  60e85f6

  Copy full SHA for 60e85f6

• pulling dev

  Dreallers

  committed
  5c787ef

  Copy full SHA for 5c787ef

• pulling dev

  Dreallers

  committed
  24ea0c0

  Copy full SHA for 24ea0c0

• config table User

  Aurelemeriau

  committed
  e025d59

  Copy full SHA for e025d59

• import userManager

  Aurelemeriau

  committed
  bff7f8b

  Copy full SHA for bff7f8b

• FilmManager creation

  Dreallers

  committed
  880502d

  Copy full SHA for 880502d

• Merge pull request #8 from Dreallers/CRUD_film

  Show description for ce2061a
  Dreallers

  authored
  ce2061a

  Copy full SHA for ce2061a

• gestion conflits

  Aurelemeriau

  committed
  0fbf442

  Copy full SHA for 0fbf442

• Merge pull request #10 from Dreallers/S1_configTableUser

  Show description for 7e6f806
  Aurelemeriau

  authored
  7e6f806

  Copy full SHA for 7e6f806

• SerieManager

  Tony97421

  committed
  49912df

  Copy full SHA for 49912df

• Merge branch 'dev' into s01SerieManager

  Tony97421

  authored
  6ecd7ca

  Copy full SHA for 6ecd7ca

• Merge pull request #11 from Dreallers/s01SerieManager

  Show description for d6b8c50
  Tony97421

  authored
  d6b8c50

  Copy full SHA for d6b8c50

• working on backend

  Ange230700

  committed
  0b0149d

  Copy full SHA for 0b0149d

• fixing conflicts

  Ange230700

  committed
  bd56b2d

  Copy full SHA for bd56b2d

• Merge pull request #12 from Dreallers/express-server

  Show description for c9a8f7f
  Ange230700

  authored
  c9a8f7f

  Copy full SHA for c9a8f7f

• working on backend

  Ange230700

  committed
  7a350f5

  Copy full SHA for 7a350f5

Commits on Dec 13, 2023

• Merge pull request #13 from Dreallers/express-server

  Show description for 926fbbd
  Ange230700

  authored
  926fbbd

  Copy full SHA for 926fbbd

• modif usercontrollers

  Aurelemeriau

  committed
  d49ad1b

  Copy full SHA for d49ad1b

• merging

  Dreallers

  committed
  083180c

  Copy full SHA for 083180c

• merging

  Dreallers

  committed
  6f0013b

  Copy full SHA for 6f0013b

• Merge pull request #15 from Dreallers/CRUD_film

  Show description for eb9bec2
  Dreallers

  authored
  eb9bec2

  Copy full SHA for eb9bec2

• commit avant pull

  Aurelemeriau

  committed
  fb45cc6

  Copy full SHA for fb45cc6

• Merge branch 'dev' of github.com:Dreallers/WildTube into S1_testFront

  Aurelemeriau

  committed
  a23ec9b

  Copy full SHA for a23ec9b

• serieControllers

  Tony97421

  committed
  0ee8f61

  Copy full SHA for 0ee8f61

• Merge pull request #16 from Dreallers/s01serieControllers

  Show description for 066810d
  Tony97421

  authored
  066810d

  Copy full SHA for 066810d

• route for Controllers

  Tony97421

  committed
  f0c306c

  Copy full SHA for f0c306c

• Merge pull request #17 from Dreallers/s01routeBackEnd

  Show description for b8a746a
  Tony97421

  authored
  b8a746a

  Copy full SHA for b8a746a

• usercontrollers

  Aurelemeriau

  committed
  4392f0d

  Copy full SHA for 4392f0d

• merging

  Dreallers

  committed
  5d81c6a

  Copy full SHA for 5d81c6a

• Merge branch 'dev' of github.com:Dreallers/WildTube into CRUD_film

  Dreallers

  committed
  14edb95

  Copy full SHA for 14edb95

• update film ok

  Dreallers

  committed
  154e055

  Copy full SHA for 154e055

• Merge pull request #18 from Dreallers/CRUD_film

  Show description for c780fc7
  Dreallers

  authored
  c780fc7

  Copy full SHA for c780fc7

• pending...

  Ange230700

  committed
  24146bc

  Copy full SHA for 24146bc

• fixing conflicts

  Ange230700

  committed
  06ae0df

  Copy full SHA for 06ae0df

• crud_film done

  Dreallers

  committed
  6f1f05b

  Copy full SHA for 6f1f05b

• Merge pull request #19 from Dreallers/CRUD_film

  Show description for a118ed3
  Dreallers

  authored
  a118ed3

  Copy full SHA for a118ed3

• modif routes

  Aurelemeriau

  committed
  3b2355d

  Copy full SHA for 3b2355d

• working on backend controllers and managers

  Ange230700

  committed
  8f26824

  Copy full SHA for 8f26824

• routes users OK

  Aurelemeriau

  committed
  7a213b8

  Copy full SHA for 7a213b8

• Merge pull request #20 from Dreallers/S1_testFront

  Show description for 0e60fe4
  Aurelemeriau

  authored
  0e60fe4

  Copy full SHA for 0e60fe4

• merging

  Dreallers

  committed
  4bf25ad

  Copy full SHA for 4bf25ad

• Merge branch 'dev' of github.com:Dreallers/WildTube into CRUD_film

  Dreallers

  committed
  88472af

  Copy full SHA for 88472af

• working on backend controllers and managers part 2

  Ange230700

  committed
  ec13ca9

  Copy full SHA for ec13ca9

• trying to do JOIN SQL request...

  Ange230700

  committed
  026d91f

  Copy full SHA for 026d91f

• toutes les routes series fonctionnent :)

  Tony97421

  committed
  b6cba8d

  Copy full SHA for b6cba8d

• Merge branch 'dev' into s01routeBackEnd

  Tony97421

  authored
  9d85fce

  Copy full SHA for 9d85fce

• Merge pull request #21 from Dreallers/s01routeBackEnd

  Show description for ea06622
  Tony97421

  authored
  ea06622

  Copy full SHA for ea06622

• creating react routes

  Ange230700

  committed
  358f9e1

  Copy full SHA for 358f9e1

• pending...

  Ange230700

  committed
  6623fb1

  Copy full SHA for 6623fb1

• fixing conflicts

  Ange230700

  committed
  f61f432

  Copy full SHA for f61f432

• Merge pull request #22 from Dreallers/sprint01-express-server

  Show description for 6cd8201
  Ange230700

  authored
  6cd8201

  Copy full SHA for 6cd8201

• merging

  Dreallers

  committed
  e3eb072

  Copy full SHA for e3eb072

• table films en tendance

  Aurelemeriau

  committed
  0231cd7

  Copy full SHA for 0231cd7

• done

  Dreallers

  committed
  05c97cb

  Copy full SHA for 05c97cb

• Merge pull request #23 from Dreallers/CRUD_favorite

  Show description for c51508c
  Dreallers

  authored
  c51508c

  Copy full SHA for c51508c

• conflicts

  Dreallers

  committed
  fc9092e

  Copy full SHA for fc9092e

• Merge pull request #24 from Dreallers/CRUD_favorite

  Show description for 1cd3a9e
  Tony97421

  authored
  1cd3a9e

  Copy full SHA for 1cd3a9e

• commit avant pull

  Aurelemeriau

  committed
  99cfa70

  Copy full SHA for 99cfa70

• pending...

  Ange230700

  committed
  240d627

  Copy full SHA for 240d627

• pending...

  Ange230700

  committed
  99f851e

  Copy full SHA for 99f851e

• fixing conflicts...

  Ange230700

  committed
  fb479e9

  Copy full SHA for fb479e9

• handling the context API

  Ange230700

  committed
  fd21da4

  Copy full SHA for fd21da4

Commits on Dec 14, 2023

• handling useParams

  Ange230700

  committed
  f3f714e

  Copy full SHA for f3f714e

• table films en tendance

  Aurelemeriau

  committed
  79b1f66

  Copy full SHA for 79b1f66

• Merge pull request #25 from Dreallers/sprint01-express-server

  Show description for c57dde2
  Ange230700

  authored
  c57dde2

  Copy full SHA for c57dde2

• route films en tendance et database films pour front

  Aurelemeriau

  committed
  2e2e1a3

  Copy full SHA for 2e2e1a3

• Merge pull request #26 from Dreallers/S1_tableJointure

  Show description for e62e406
  Ange230700

  authored
  e62e406

  Copy full SHA for e62e406

• favori_serie controller manager table et route

  Tony97421

  committed
  ab77b36

  Copy full SHA for ab77b36

• Merge branch 'dev' of github.com:Dreallers/WildTube into s01favoriSerieController

  Tony97421

  committed
  6541d4d

  Copy full SHA for 6541d4d

• implementing movie page

  Ange230700

  committed
  2813bd5

  Copy full SHA for 2813bd5

• adding video field in movie table

  Ange230700

  committed
  00cd81f

  Copy full SHA for 00cd81f

• fixing conflicts

  Ange230700

  committed
  e00a3a6

  Copy full SHA for e00a3a6

• working on video player

  Ange230700

  committed
  8b50fc1

  Copy full SHA for 8b50fc1

• updating

  Ange230700

  committed
  7a3ce03

  Copy full SHA for 7a3ce03

Commits on Dec 15, 2023

• jointure favori serie ok

  Tony97421

  committed
  2a9bfc1

  Copy full SHA for 2a9bfc1

• Merge pull request #27 from Dreallers/s01favoriSerieController

  Show description for bf74610
  Ange230700

  authored
  bf74610

  Copy full SHA for bf74610

• pending...

  Ange230700

  committed
  e166c85

  Copy full SHA for e166c85

• pending...

  Ange230700

  committed
  337cab9

  Copy full SHA for 337cab9

• pending...

  Ange230700

  committed
  776bcc9

  Copy full SHA for 776bcc9

• fixing conflicts

  Ange230700

  committed
  24066d3

  Copy full SHA for 24066d3

• Merge pull request #29 from Dreallers/sprint01-movie-page-front

  Show description for 11409a1
  Aurelemeriau

  authored
  11409a1

  Copy full SHA for 11409a1

• ...

  Ange230700

  committed
  b75bd32

  Copy full SHA for b75bd32

• Merge pull request #30 from Dreallers/sprint01-movie-page-front

  Show description for 7686ace
  Aurelemeriau

  authored
  7686ace

  Copy full SHA for 7686ace