Weekly Merge To Master (!13) · Merge requests · Eirik Steira / Team 14

Merged Eirik Steira requested to merge dev into master 5 years ago

Mar 13, 2020
- Merge branch 'Auth' into 'dev' · abdd152b
  Eirik Steira authored 5 years ago
  
  Auth See merge request !12
  abdd152b
- Auth · cc2f85cc
  Mads Lundegaard authored 5 years ago and Eirik Steira committed 5 years ago
  
  cc2f85cc
- Merge branch 'setup-ORM-faker' into 'dev' · b1605fca
  Mads Lundegaard authored 5 years ago
  
  Setup Temperary ORM Faker See merge request !11
  b1605fca
- Add docstrings to Dao interface and UserDao, add relevant null checks · 44b5ecf2
  Eirik Steira authored 5 years ago and Mads Lundegaard committed 5 years ago
  
  Add *.properties to .gitignore
  44b5ecf2
Mar 11, 2020
- Merge branch 'setup-db-connection' into 'dev' · a3763838
  Mads Lundegaard authored 5 years ago
  
  Setup db connection See merge request !10
  a3763838
Mar 10, 2020

Eirik Steira authored 5 years ago

Remove logger from DBConnection

Remove unused code in DBConnection

Update readme Get Started instructions

Fix typo in docstrings DBConnection

c3b51943

Mar 09, 2020
- Setup initial database connection with connection pool with HikariCP · a37af0c5
  Eirik Steira authored 5 years ago
  
  a37af0c5
- Merge branch 'dev' of... · b50e983c
  Eirik Steira authored 5 years ago
  
  Merge branch 'dev' of https://gitlab.stud.idi.ntnu.no/eirsteir/team-14-software-engineering into dev
  b50e983c
- Merge branch 'New_Login' into 'dev' · 8f59d22d
  Eirik Steira authored 5 years ago
  
  Added basic layout for login and sign up pages in the new project structure See merge request !9
  8f59d22d
- Structure changes · 91271cf4
  Nicolay Schiøll-Johansen authored 5 years ago
  
  91271cf4
- Target gitignore fix · de8e106b
  Eirik Steira authored 5 years ago
  
  de8e106b
- Target gitignore fix · f490efaa
  Eirik Steira authored 5 years ago
  
  f490efaa
- Add .target/ and .idea/ to .gitignore · 935355f1
  Eirik Steira authored 5 years ago
  
  935355f1
- gitignore fix · 1e983996
  Eirik Steira authored 5 years ago
  
  1e983996
- fixed compile file · 022fcec3
  Nicolay Schiøll-Johansen authored 5 years ago
  
  022fcec3
Mar 07, 2020
- Added basic layout for login and sign up pages in the new project structure · 14737ea6
  Nicolay Schiøll-Johansen authored 5 years ago
  
  14737ea6

Weekly Merge To Master