Commits · abf950744e0ce55a6a58646a9c720b2c3c01734b · IDATT2106 Scrum Team 02 / Frontend

May 04, 2023
- Merge branch 'containerization' into 'main' · abf95074
  Jakob Karevold Grønhaug authored 1 year ago
```
Legg til Docker-konfigurasjon

See merge request !24
```
  abf95074
- Legg til Docker-konfigurasjon · 113c7828
  Jakob Grønhaug authored 1 year ago
  
  113c7828
- Merge branch 'ukemeny' into 'main' · 61b3e26d
  Jakob Karevold Grønhaug authored 1 year ago
```
ukemeny

See merge request !22
```
  61b3e26d
- ukemeny · e302e731
  Jakob Karevold Grønhaug authored 1 year ago
  
  e302e731
- Merge branch 'profilinnstillinger' into 'main' · b1284681
  Ingrid Martinsheimen Egge authored 1 year ago
```
Merge profilinnstillinger into main

See merge request !21
```
  b1284681
- package.json · 76a954ec
  Ingrid Martinsheimen Egge authored 1 year ago
  
  76a954ec
- Fjerna logg-ut i created · 877cc8a5
  Sondre Malerud authored 1 year ago
  
  877cc8a5
- rettet opp kjøleskapstest · 209726ad
  Ingrid Martinsheimen Egge authored 1 year ago
  
  209726ad
- merge · 22029ab9
  Ingrid Martinsheimen Egge authored 1 year ago
  
  22029ab9
- Fjernet komponent · c553fc48
  Ingrid Martinsheimen Egge authored 1 year ago
  
  c553fc48
- Merge branch 'fridge-updates' into 'main' · 4a09181e
  Ingrid Martinsheimen Egge authored 1 year ago
```
Fridge updates

See merge request !20
```
  4a09181e
- rettet opp feil med søkeboks. · 034612d1
  Ingrid Martinsheimen Egge authored 1 year ago
  
  034612d1
- fjernet fridge som eget store. oppdaterte metoder · 7336bdaf
  Ingrid Martinsheimen Egge authored 1 year ago
  
  7336bdaf
- flere tester · f91b7cc5
  Ingrid Martinsheimen Egge authored 1 year ago
  
  f91b7cc5
May 03, 2023
- la inn profiltest · 3ee31938
  Ingrid Martinsheimen Egge authored 1 year ago
  
  3ee31938
- Merge branch 'handleliste' into 'main' · 3ead56bb
  Sondre Malerud authored 1 year ago
```
Handleliste

See merge request !19
```
  3ead56bb
- Handleliste · 8c2ef525
  Sondre Malerud authored 1 year ago
  
  8c2ef525
- Merge branch 'recipe-view' into 'main' · bacc868a
  Katarzyna Szlejter authored 1 year ago
```
Recipe view. Needs tests.

See merge request !18
```
  bacc868a
- Recipe view. Needs tests. · 4f292785
  Katarzyna Szlejter authored 1 year ago
  
  4f292785
- rettet opp feilmeldinger · 0c590be4
  Ingrid Martinsheimen Egge authored 1 year ago
  
  0c590be4
- la in iconify og flaticon credit på settings siden · 0b1018f0
  Ingrid Martinsheimen Egge authored 1 year ago
  
  0b1018f0
- edit account og editprofile css bruker samme klasser · 027adb21
  Ingrid Martinsheimen Egge authored 1 year ago
  
  027adb21
- la inn tester for editAccount · d646442a
  Ingrid Martinsheimen Egge authored 1 year ago
  
  d646442a
May 02, 2023
- bedre feilmeldinger. forenklet metoder · 4c0ebe73
  Ingrid Martinsheimen Egge authored 1 year ago
  
  4c0ebe73
- opprydding og småendringer · c4ba80e2
  Ingrid Martinsheimen Egge authored 1 year ago
  
  c4ba80e2
- justering i farge · c38b0447
  Ingrid Martinsheimen Egge authored 1 year ago
  
  c38b0447
- Merge remote-tracking branch 'origin/profilinnstillinger' into profilinnstillinger · 78e86021
  Ingrid Martinsheimen Egge authored 1 year ago
```
# Conflicts:
#	src/components/EditProfile.vue
#	src/components/Navbar.vue
```
  78e86021
- Merge branch 'pincode-view' into 'main' · 7b8db049
  Katarzyna Szlejter authored 1 year ago
```
Pincode view

See merge request !17
```
  7b8db049
- Pincode view · 8fc370b1
  Katarzyna Szlejter authored 1 year ago
  
  8fc370b1
- Merge branch 'opprett-profil' into 'main' · ae325e33
  Jakob Karevold Grønhaug authored 1 year ago
```
all funksjonalitet og filopplasting på plass

See merge request !15
```
  ae325e33
- Merge branch 'opprett-profil' of... · 6c058628
  Jakob Grønhaug authored 1 year ago
```
Merge branch 'opprett-profil' of gitlab.stud.idi.ntnu.no:idatt2106-scrum-team-02/frontend into opprett-profil
```
  6c058628
- all funksjonalitet og filopplasting på plass · 9bcdc0df
  Jakob Grønhaug authored 1 year ago
  
  9bcdc0df
- all funksjonalitet og filopplasting på plass · 0b841795
  Jakob Grønhaug authored 1 year ago
  
  0b841795
- Merge branch 'fridgeView' into 'main' · c2b3b8f4
  Ingrid Martinsheimen Egge authored 1 year ago
```
Fridge view

See merge request !13
```
  c2b3b8f4
- justering i farge · dafa0245
  Ingrid Martinsheimen Egge authored 1 year ago
  
  dafa0245
- la inn cursor:ponter. la inn hover-farger i scss fila · 514fe066
  Ingrid Martinsheimen Egge authored 1 year ago
  
  514fe066
- Enheter tilpasser seg · bd618f39
  Ingrid Martinsheimen Egge authored 1 year ago
  
  bd618f39
- Merge branch 'tilbudsavis' into 'main' · c30ac9e5
  Ingrid Martinsheimen Egge authored 1 year ago
```
Tilbudsavis

See merge request !12
```
  c30ac9e5
- Tilbudsavis · 6f8221b3
  Ingrid Martinsheimen Egge authored 1 year ago
  
  6f8221b3
May 01, 2023
- Merge branch 'main' into profilinnstillinger · 3fba3e17
  Ingrid Martinsheimen Egge authored 1 year ago
  
  3fba3e17