Commits · cf6c45177e3edbbcb6afb43510012af91081fa4e · Rolf Erik Sesseng Aas / tdt4242-base

18 Apr, 2021 10 commits
- Fix bad code smell - "input" used in both inner and outer scopes. · cf6c4517
  ibooking-sigurd authored Apr 18, 2021
  
  cf6c4517
- Merge branch 'Fix_method_abstraction_in_diet.js' into 'Refactor' · b5f83ac2
  Sigurd Røstad Augdal authored Apr 18, 2021
```
Fix method abstraction in diet.js ("addMealtypeOptions()").

See merge request !10
```
  b5f83ac2
- Fix method abstraction in diet.js ("addMealtypeOptions()"). · 2fff2e3d
  ibooking-sigurd authored Apr 18, 2021
  
  2fff2e3d
- Removed unused code · 98a4862d
  Rolf Aas authored Apr 18, 2021
  
  98a4862d
- Better password validation · 87e572c3
  Rolf Aas authored Apr 18, 2021
  
  87e572c3
- Rmeoved unused code · bb45ff76
  Rolf Aas authored Apr 18, 2021
  
  bb45ff76
- Better readability of djangoHeroku · 7adde052
  Rolf Aas authored Apr 18, 2021
  
  7adde052
- Simplified heroku deploy code · 410675b5
  Rolf Aas authored Apr 18, 2021
  
  410675b5
- Simplify method · 1e3bd033
  Rolf Aas authored Apr 18, 2021
  
  1e3bd033
- Removed unused code · c8c44a6b
  Rolf Aas authored Apr 18, 2021
  
  c8c44a6b
17 Apr, 2021 20 commits
- Merge branch 'Refactor' of https://gitlab.stud.idi.ntnu.no/reaas/tdt4242-base into Refactor · 5ef5b541
  KreizerHgz authored Apr 17, 2021
  
  5ef5b541
- Removed some random comments, not enough for its own code smell · cbb76b13
  KreizerHgz authored Apr 17, 2021
  
  cbb76b13
- Duplication of code in diet migration · 73b6b842
  Rolf Aas authored Apr 17, 2021
  
  73b6b842
- Merge branch 'Refactor' of https://gitlab.stud.idi.ntnu.no/reaas/tdt4242-base into Refactor · 6fbdc5b2
  Rolf Aas authored Apr 17, 2021
  
  6fbdc5b2
- Code smell 17 refactored · af1a5279
  KreizerHgz authored Apr 17, 2021
  
  af1a5279
- Merge branch 'Refactor' of https://gitlab.stud.idi.ntnu.no/reaas/tdt4242-base into Refactor · 30d5ffcf
  Rolf Aas authored Apr 17, 2021
  
  30d5ffcf
- Code smell 16 refactored · 0cfcc586
  KreizerHgz authored Apr 17, 2021
  
  0cfcc586
- Code smell 15 refactored · 3df90d74
  KreizerHgz authored Apr 17, 2021
  
  3df90d74
- Code smell 14 refactored · 7fe7ab17
  KreizerHgz authored Apr 17, 2021
  
  7fe7ab17
- Code smell 13 refactored · 5845a073
  KreizerHgz authored Apr 17, 2021
  
  5845a073
- Code smell 12 refactored and test for mealtype.js added · bd74a975
  KreizerHgz authored Apr 17, 2021
  
  bd74a975
- Removed unused code · d8450e8f
  Rolf Aas authored Apr 17, 2021
  
  d8450e8f
- Code smell 10 refactored · e647b9af
  KreizerHgz authored Apr 17, 2021
  
  e647b9af
- Code smell 9 refactored · 570a6040
  KreizerHgz authored Apr 17, 2021
  
  570a6040
- Code smell 8 refactored · 70b2a67e
  KreizerHgz authored Apr 17, 2021
  
  70b2a67e
- Code smell 7 refactored · 407e2fb7
  KreizerHgz authored Apr 17, 2021
  
  407e2fb7
- Code smell 6 refactored · 0af319ee
  KreizerHgz authored Apr 17, 2021
  
  0af319ee
- Refactored code smell 5 · 7178b76a
  KreizerHgz authored Apr 17, 2021
  
  7178b76a
- Code smell 4 refactored · d3d6617f
  KreizerHgz authored Apr 17, 2021
  
  d3d6617f
- Refactored code smell 3 · 16b3d38c
  KreizerHgz authored Apr 17, 2021
  
  16b3d38c
16 Apr, 2021 3 commits
- Code smell 2 refactored · da33e056
  KreizerHgz authored Apr 16, 2021
  
  da33e056
- Refactored code smell 1 · b025fff8
  KreizerHgz authored Apr 16, 2021
  
  b025fff8
- Added scanner to gitignore · 216d06ee
  KreizerHgz authored Apr 16, 2021
  
  216d06ee
19 Mar, 2021 7 commits
- Added Diet to be able to commit. · 827c9b0d
  ibooking-sigurd authored Mar 19, 2021
  
  827c9b0d
- Merge branch 'develop' into 'master' · 003bc151
  Rolf Erik Sesseng Aas authored Mar 19, 2021
```
Revert "Merge branch 'master' into 'develop'"

See merge request !8
```
  003bc151
- fixed failing test · 6974bf9b
  Rolf Aas authored Mar 19, 2021
  
  6974bf9b
- Merge branch 'Diet_layout_and_function_setup' into develop · 6fc47cfc
  Rolf Aas authored Mar 19, 2021
  
  6fc47cfc
- merged · 1c97d2b9
  Rolf Aas authored Mar 19, 2021
  
  1c97d2b9
- Merge branch 'develop' into 'master' · 528dcbf3
  Rolf Erik Sesseng Aas authored Mar 19, 2021
```
Develop

See merge request !7
```
  528dcbf3
- Merge branch 'master' into 'develop' · 15812202
  Rolf Erik Sesseng Aas authored Mar 19, 2021
```
# Conflicts:
#   .gitlab-ci.yml
#   backend/secfit/secfit/djangoHeroku.py
#   backend/secfit/secfit/settings.py
```
  15812202