Commits · 3b0bc82f97fdf2935d2b2b4b6fbc39307e077437 · IT2810-H19 / Teams / Team 10 / Prosjekt 4

13 Nov, 2019 1 commit
- 23 added favourite reducer/actions · 3b0bc82f
  Solveig Hergot Langås authored Nov 13, 2019
  
  3b0bc82f
12 Nov, 2019 22 commits
- Merge branch 'favourite-asyncstorage' into 'master' · f0c06447
  Hedda Mathilde Sæther Langvik authored Nov 12, 2019
```
Favourite asyncstorage

See merge request !17
```
  f0c06447
- Merge branch 'favourite-asyncstorage' of... · 7fbdde28
  Hedda authored Nov 12, 2019
```
Merge branch 'favourite-asyncstorage' of https://gitlab.stud.idi.ntnu.no/IT2810-H19/teams/team-10/prosjekt-4 into favourite-asyncstorage
```
  7fbdde28
- #8 saves favourite and displays it in new tab · 8a446725
  Hedda authored Nov 12, 2019
  
  8a446725
- #8 started with async · 1b7d68ba
  Hedda authored Nov 12, 2019
  
  1b7d68ba
- #8 saves favourite and displays it in new tab · 3cf02511
  Hedda authored Nov 12, 2019
  
  3cf02511
- Update README.md · e17658a5
  Solveig Hergot Langås authored Nov 12, 2019
  
  e17658a5
- #8 started with async · 2d178387
  Hedda authored Nov 12, 2019
  
  2d178387
- Merge branch 'async' into 'master' · 8e48a7ed
  Solveig Hergot Langås authored Nov 12, 2019
```
Async

See merge request !16
```
  8e48a7ed
- #21 cards works perfectly · 90c98eac
  Solveig Hergot Langås authored Nov 12, 2019
  
  90c98eac
- Merge remote-tracking branch 'origin/master' into async · c3d4393c
  Solveig Hergot Langås authored Nov 12, 2019
  
  c3d4393c
- ? · a7f5feca
  Solveig Hergot Langås authored Nov 12, 2019
  
  a7f5feca
- Merge branch 'async' of gitlab.stud.idi.ntnu.no:IT2810-H19/teams/team-10/prosjekt-4 into async · 2eca7155
  Solveig Hergot Langås authored Nov 12, 2019
  
  2eca7155
- Merge branch 'detailed-card' into 'master' · 69abbc6c
  Hedda Mathilde Sæther Langvik authored Nov 12, 2019
```
#4 Finished detailed page (scroll not working)

See merge request !15
```
  69abbc6c
- Merge branch 'Test' into 'async' · 08d3b53c
  Solveig Hergot Langås authored Nov 12, 2019
```
#21 Seperated Cards into ExploreCard and HomeCard

See merge request !14
```
  08d3b53c
- #4 Finished detailed page (scroll not working) · fd103091
  Hedda authored Nov 12, 2019
  
  fd103091
- #21 Seperated Cards into ExploreCard and HomeCard · d611050d
  Solveig Hergot Langås authored Nov 12, 2019
  
  d611050d
- Merge branch 'detailed-card' into 'master' · 47b27404
  Hedda Mathilde Sæther Langvik authored Nov 12, 2019
```
#13 all good in the hood with backend and sorting

See merge request !13
```
  47b27404
- #13 all good in the hood with backend and sorting · 45972fb5
  Hedda authored Nov 12, 2019
  
  45972fb5
- Merge branch 'detailed-card' into 'master' · e59a41de
  Hedda Mathilde Sæther Langvik authored Nov 12, 2019
```
#13 backend woring and started on detailed card

See merge request !12
```
  e59a41de
- #13 backend woring and started on detailed card · 716c4b7b
  Hedda authored Nov 12, 2019
  
  716c4b7b
- Merge branch 'Explore-page-+-scroll' into 'master' · 78b3a06a
  Solveig Hergot Langås authored Nov 12, 2019
```
Explore page + scroll

See merge request !11
```
  78b3a06a
- test · 41642daa
  Solveig Hergot Langås authored Nov 12, 2019
  
  41642daa
11 Nov, 2019 7 commits
- #7 basics in README · 2b228d40
  Hedda authored Nov 11, 2019
  
  2b228d40
- Merge remote-tracking branch 'origin/master' into Explore-page-+-scroll · ade72aac
  Solveig Hergot Langås authored Nov 11, 2019
  
  ade72aac
- Small changes · bfbe711f
  Solveig Hergot Langås authored Nov 11, 2019
  
  bfbe711f
- No commit message · dde634a0
  Hedda authored Nov 11, 2019
```
No commit message
```
  dde634a0
- Merge branch 'backend' into 'master' · 427e1e4f
  Hedda Mathilde Sæther Langvik authored Nov 11, 2019
```
Backend

See merge request !10
```
  427e1e4f
- Merge branch 'master' into 'backend' · 48104cb5
  Hedda Mathilde Sæther Langvik authored Nov 11, 2019
```
# Conflicts:
#   frontend/pages/HomePage.js
```
  48104cb5
- #13 backend all good in the hood · 2c4fbcb3
  Hedda authored Nov 11, 2019
  
  2c4fbcb3
08 Nov, 2019 6 commits
- #20 connected card to database · 43d1ab52
  Hedda authored Nov 08, 2019
  
  43d1ab52
- #13 fetcher updated · f37514fe
  Hedda authored Nov 08, 2019
  
  f37514fe
- #13 & #20 Card object connected to database · 92fd4bec
  Hedda authored Nov 08, 2019
  
  92fd4bec
- #19 Flatlist working, renders all items at once:( · f4c1a3b1
  Solveig Hergot Langås authored Nov 08, 2019
  
  f4c1a3b1
- Merge branch 'FixSearch' into 'master' · 189ff1c4
  Solveig Hergot Langås authored Nov 08, 2019
```
#14 Keyboard dismissed after search pressed

See merge request !9
```
  189ff1c4
- #14 Keyboard dismissed after search pressed · c93e64ba
  Solveig Hergot Langås authored Nov 08, 2019
  
  c93e64ba
07 Nov, 2019 4 commits
- Merge branch 'backend' of... · 14fcec00
  Hedda authored Nov 07, 2019
```
Merge branch 'backend' of https://gitlab.stud.idi.ntnu.no/IT2810-H19/teams/team-10/prosjekt-4 into backend
```
  14fcec00
- #13 not fetching data · 3699a010
  Hedda authored Nov 07, 2019
  
  3699a010
- #13 not fetching data · a329e1c5
  Hedda authored Nov 07, 2019
  
  a329e1c5
- Merge branch 'restruc' into 'master' · acfee6e7
  Amalie Eline Henni authored Nov 07, 2019
```
restructure mappestrukturen

See merge request !8
```
  acfee6e7