Code

Pull request door marijn#49

Code

Open

MarijnMolenaar wants to merge 75 commits intomarijnMarijnMolenaar/team-5-repo:marijnfrom mainMarijnMolenaar/team-5-repo:mainCopy head branch name to clipboard

+26,570-3

Commits

Commits on Mar 29, 2022

• Push application to main

  Show description for 569b211
  Joosiii

  committed
  569b211

  Copy full SHA for 569b211

Commits on Mar 30, 2022

• Filterfunctie

  Show description for 4f788bc
  Joosiii

  committed
  4f788bc

  Copy full SHA for 4f788bc

• Merge pull request #20 from MarijnMolenaar/joost-dev

  Show description for c2432a9
  Joosiii

  authored
  c2432a9

  Copy full SHA for c2432a9

Commits on Mar 31, 2022

• Express Bug Fix + Filter Fix

  Show description for da61174
  Joosiii

  committed
  da61174

  Copy full SHA for da61174

• Merge pull request #22 from MarijnMolenaar/joost-dev

  Show description for c24f93c
  Joosiii

  authored
  c24f93c

  Copy full SHA for c24f93c

• Filter Bug Fix

  Show description for 723904e
  Joosiii

  committed
  723904e

  Copy full SHA for 723904e

• Merge pull request #24 from MarijnMolenaar/joost-dev

  Show description for 4e7575d
  Joosiii

  authored
  4e7575d

  Copy full SHA for 4e7575d

• correcte commit voor like systeem

  MarijnMolenaar

  committed
  bdd4b77

  Copy full SHA for bdd4b77

• Revert "correcte commit voor like systeem"

  Show description for 1226a6c
  MarijnMolenaar

  committed
  1226a6c

  Copy full SHA for 1226a6c

Commits on Apr 1, 2022

• Merge pull request #26 from MarijnMolenaar/marijn

  Show description for 928baa5
  MarijnMolenaar

  authored
  928baa5

  Copy full SHA for 928baa5

• Add Dislike Feature + Fix Match Screen + Add Active State

  Show description for b4c8ede
  Joosiii

  committed
  b4c8ede

  Copy full SHA for b4c8ede

• Merge pull request #27 from MarijnMolenaar/joost-dev

  Show description for 055e6ba
  Joosiii

  authored
  055e6ba

  Copy full SHA for 055e6ba

• Liked Profiles Detail Pages

  Show description for 4d71d2a
  Joosiii

  committed
  4d71d2a

  Copy full SHA for 4d71d2a

• Merge pull request #29 from MarijnMolenaar/joost-dev

  Show description for ab18de0
  Joosiii

  authored
  ab18de0

  Copy full SHA for ab18de0

Commits on Apr 3, 2022

• Update

  Show description for 5586782
  TessaFlorance

  committed
  5586782

  Copy full SHA for 5586782

• Update README.md

  Whtneyas

  authored
  7e5031d

  Copy full SHA for 7e5031d

• Update README.md

  Whtneyas

  authored
  b847f6d

  Copy full SHA for b847f6d

• Update README.md

  MarijnMolenaar

  authored
  65905c3

  Copy full SHA for 65905c3

• Update README.md

  MarijnMolenaar

  authored
  0bc077a

  Copy full SHA for 0bc077a

• Update README.md

  MarijnMolenaar

  authored
  dfbc38f

  Copy full SHA for dfbc38f

• Update README.md

  MarijnMolenaar

  authored
  173fa5e

  Copy full SHA for 173fa5e

• Update README.md

  Joosiii

  authored
  646b25e

  Copy full SHA for 646b25e

• Update README.md

  Whtneyas

  authored
  b2f9b4b

  Copy full SHA for b2f9b4b

• Update README.md

  Joosiii

  authored
  2d0d3cb

  Copy full SHA for 2d0d3cb

• Update

  Show description for e0904e1
  TessaFlorance

  committed
  e0904e1

  Copy full SHA for e0904e1

• Merge branch 'main' of https://github.com/MarijnMolenaar/team-5-repo

  TessaFlorance

  committed
  6153e2e

  Copy full SHA for 6153e2e

• old methode remove

  TessaFlorance

  committed
  b6e56a6

  Copy full SHA for b6e56a6

• Sticky Header

  Show description for f70117a
  Joosiii

  committed
  f70117a

  Copy full SHA for f70117a

• Merge pull request #39 from MarijnMolenaar/joost-dev

  Show description for 4db503f
  Joosiii

  authored
  4db503f

  Copy full SHA for 4db503f

• Update VOORBEELDenv

  Joosiii

  authored
  9dcffc6

  Copy full SHA for 9dcffc6

• uglify js

  TessaFlorance

  committed
  f15e541

  Copy full SHA for f15e541

• Merge branch 'main' of https://github.com/MarijnMolenaar/team-5-repo

  TessaFlorance

  committed
  d8c1d56

  Copy full SHA for d8c1d56

• Mongoose Added

  Show description for 3edd4b7
  Joosiii

  committed
  3edd4b7

  Copy full SHA for 3edd4b7

• Merge pull request #40 from MarijnMolenaar/joost-dev

  Show description for 6921364
  Joosiii

  authored
  6921364

  Copy full SHA for 6921364

• Mongoose Package Added

  Joosiii

  committed
  67fda22

  Copy full SHA for 67fda22

• Merge pull request #41 from MarijnMolenaar/joost-dev

  Show description for 4b3c5d8
  Joosiii

  authored
  4b3c5d8

  Copy full SHA for 4b3c5d8

• Update README.md

  Joosiii

  authored
  9e11190

  Copy full SHA for 9e11190

• Update README.md

  Joosiii

  authored
  1ebc8bf

  Copy full SHA for 1ebc8bf

• Update README.md

  Joosiii

  authored
  894430a

  Copy full SHA for 894430a

Commits on Apr 5, 2022

• feat: add to-do comments (password)

  deannabosschert

  committed
  b087695

  Copy full SHA for b087695

• feat: add todo comments && change order or functions

  deannabosschert

  committed
  9fb1088

  Copy full SHA for 9fb1088

• Merge pull request #48 from deannabosschert/fix/multipleUsers

  Show description for 7b54583
  TessaFlorance

  authored
  7b54583

  Copy full SHA for 7b54583

Commits on Apr 7, 2022

• fix: trailing whitespace in folder name

  deannabosschert

  committed
  6b9f395

  Copy full SHA for 6b9f395

• Merge pull request #50 from deannabosschert/main

  Show description for cdb0378
  MarijnMolenaar

  authored
  cdb0378

  Copy full SHA for cdb0378

• Added Styling / Changed HTML / Added Sessions

  Show description for e3b099a
  Joosiii

  committed
  e3b099a

  Copy full SHA for e3b099a

• Merge pull request #51 from MarijnMolenaar/profile-styling-and-sessions

  Show description for 25d8c5f
  Joosiii

  authored
  25d8c5f

  Copy full SHA for 25d8c5f

• Update VOORBEELDenv

  Show description for ccbfc66
  Joosiii

  authored
  ccbfc66

  Copy full SHA for ccbfc66

• Update

  TessaFlorance

  committed
  a4af1f6

  Copy full SHA for a4af1f6

• Merge pull request #55 from MarijnMolenaar/makeprofile-edit

  Show description for 8dd221f
  TessaFlorance

  authored
  8dd221f

  Copy full SHA for 8dd221f

Commits on Apr 8, 2022

• Update app.js

  TessaFlorance

  committed
  3f602e9

  Copy full SHA for 3f602e9

• Merge pull request #56 from MarijnMolenaar/makeprofile-edit

  Show description for 6855534
  TessaFlorance

  authored
  6855534

  Copy full SHA for 6855534

Commits on Apr 9, 2022

• update button's

  TessaFlorance

  committed
  267c758

  Copy full SHA for 267c758

• Merge pull request #60 from MarijnMolenaar/makeprofile-edit

  Show description for b1867ba
  TessaFlorance

  authored
  b1867ba

  Copy full SHA for b1867ba

Commits on Apr 10, 2022

• buttons werkend krijgen

  TessaFlorance

  committed
  f9539d4

  Copy full SHA for f9539d4

• Merge pull request #61 from MarijnMolenaar/makeprofile-edit

  Show description for ca0a637
  TessaFlorance

  authored
  ca0a637

  Copy full SHA for ca0a637

• buttons

  TessaFlorance

  committed
  437667d

  Copy full SHA for 437667d

• Update user.js

  TessaFlorance

  committed
  3dee334

  Copy full SHA for 3dee334

• Update user.js

  TessaFlorance

  committed
  e27b161

  Copy full SHA for e27b161

• Merge branch 'main' into makeprofile-edit

  TessaFlorance

  authored
  869e5a9

  Copy full SHA for 869e5a9

• Merge pull request #62 from MarijnMolenaar/makeprofile-edit

  Show description for faceb58
  TessaFlorance

  authored
  faceb58

  Copy full SHA for faceb58

• Update README.md

  Joosiii

  authored
  00c106a

  Copy full SHA for 00c106a

• Nodemailer Security + App Fix + Removing Comments

  Show description for 9ebc041
  Joosiii

  committed
  9ebc041

  Copy full SHA for 9ebc041

• Merge pull request #63 from MarijnMolenaar/mail-server

  Show description for 94511f4
  Joosiii

  authored
  94511f4

  Copy full SHA for 94511f4

Commits on Apr 11, 2022

• loginuitwerking added

  Whtneyas

  committed
  003388f

  Copy full SHA for 003388f

• images added

  Whtneyas

  committed
  c0363c8

  Copy full SHA for c0363c8

• route for login added

  Whtneyas

  committed
  072f8b0

  Copy full SHA for 072f8b0

• authentification added

  Whtneyas

  committed
  a928acd

  Copy full SHA for a928acd

• logincss added

  Whtneyas

  committed
  7f5b516

  Copy full SHA for 7f5b516

• loginpage added

  Whtneyas

  committed
  70aae9a

  Copy full SHA for 70aae9a

• index page directed to loginpage

  Whtneyas

  committed
  739c4dc

  Copy full SHA for 739c4dc

• model updated

  Whtneyas

  committed
  eb2b6db

  Copy full SHA for eb2b6db

• passport added to middleware

  Whtneyas

  committed
  24d23db

  Copy full SHA for 24d23db

• Style.css

  Show description for 34a6116
  MarijnMolenaar

  authored
  34a6116

  Copy full SHA for 34a6116

• New Profile Pictures Added

  Joosiii

  committed
  41eaf5f

  Copy full SHA for 41eaf5f

• Merge pull request #64 from MarijnMolenaar/mail-server

  Show description for a6cc83f
  Joosiii

  authored
  a6cc83f

  Copy full SHA for a6cc83f