Commits · 1753a85cfb14cef43cfb25b64369274e1f7277d7 · IT2810-H19 / Teams / Team 8 / Project4

15 Nov, 2019 20 commits
- Merged master into Stylingdev · 1753a85c
  Adrian authored Nov 15, 2019
  
  1753a85c
- Final touches · 75376c15
  Adrian authored Nov 15, 2019
  
  75376c15
- Update README.md · cbb073ad
  Halvor Horge authored Nov 15, 2019
  
  cbb073ad
- Update README.md · 45a8a312
  Halvor Horge authored Nov 15, 2019
  
  45a8a312
- Update README.md · 5596d2b2
  Halvor Horge authored Nov 15, 2019
  
  5596d2b2
- Update README.md · 201adc02
  Halvor Horge authored Nov 15, 2019
  
  201adc02
- Update README.md · 99f9fb60
  Halvor Horge authored Nov 15, 2019
  
  99f9fb60
- Update README.md · bcd2c4e5
  Halvor Horge authored Nov 15, 2019
  
  bcd2c4e5
- Update README.md · caee9c5a
  Joakim Hantho Qvale authored Nov 15, 2019
  
  caee9c5a
- Update README.md · 258587e7
  Joakim Hantho Qvale authored Nov 15, 2019
  
  258587e7
- Merged Stylingdev into master · 187f7e51
  Adrian authored Nov 15, 2019
  
  187f7e51
- Merged master into StylingDev · d4dc9897
  Adrian authored Nov 15, 2019
  
  d4dc9897
- #10 Added better colors and locked in portrait · 21bf36e5
  Adrian authored Nov 15, 2019
  
  21bf36e5
- #9 selectet filter now showing · 14d0baa9
  Joakim Hantho Qvale authored Nov 15, 2019
  
  14d0baa9
- Merge branch 'filterstyle' of gitlab.stud.idi.ntnu.no:IT2810-H19/teams/team-8/project4 · d79c0e5f
  Joakim Hantho Qvale authored Nov 15, 2019
  
  d79c0e5f
- #9 filtering finished - styled and is now showing correct filter selected · 9d849c87
  Joakim Hantho Qvale authored Nov 15, 2019
  
  9d849c87
- Update README.md · 898a522f
  Joakim Hantho Qvale authored Nov 15, 2019
  
  898a522f
- Update README.md · d62eb564
  Joakim Hantho Qvale authored Nov 15, 2019
  
  d62eb564
- Update README.md · 11467f8b
  Halvor Horge authored Nov 15, 2019
  
  11467f8b
- Update README.md · c620c32b
  Halvor Horge authored Nov 15, 2019
  
  c620c32b
14 Nov, 2019 9 commits
- Merged master into DetailDev · d5dc6fb7
  Adrian authored Nov 14, 2019
  
  d5dc6fb7
- Merged master into hamburgerDev · 462d9fde
  Halvor Horge authored Nov 14, 2019
  
  462d9fde
- #9 Added filtering to sidemenu · 5960b01e
  Halvor Horge authored Nov 14, 2019
  
  5960b01e
- #6 master sorting push · 63504abb
  Joakim Hantho Qvale authored Nov 14, 2019
  
  63504abb
- #8 Added functionality for fetching more data, added a button, and fixed som colors · 2b0dfbf6
  Adrian authored Nov 14, 2019
  
  2b0dfbf6
- Safety commit · 1249ec41
  Halvor Horge authored Nov 14, 2019
  
  1249ec41
- #6 merging conflicts · e2e037fb
  Joakim Hantho Qvale authored Nov 14, 2019
  
  e2e037fb
- #6 sorting results is now finished. Could use some coloring enhancement · 2c3bd734
  Joakim Hantho Qvale authored Nov 14, 2019
  
  2c3bd734
- #7 Added filtering buttons to hamburger button · 8ac51fe1
  Halvor Horge authored Nov 14, 2019
  
  8ac51fe1
13 Nov, 2019 5 commits
- New overlay for sidemenu · 6430a54b
  Halvor Horge authored Nov 13, 2019
  
  6430a54b
- #6 added sorting buttons, but they dont work yet · f704eb94
  Joakim Hantho Qvale authored Nov 13, 2019
  
  f704eb94
- #3 Added info in overlay · 698eb748
  Adrian authored Nov 13, 2019
  
  698eb748
- Merge branch 'master' into 'hamburgerDev' · a424efea
  Halvor Horge authored Nov 13, 2019
```
Master

See merge request !8
```
  a424efea
- Merge branch 'hamburgerDev' into 'master' · a7281219
  Halvor Horge authored Nov 13, 2019
```
# Conflicts:
#   p4/.expo/packager-info.json
```
  a7281219
12 Nov, 2019 5 commits
- Merge branch 'backendDev' into 'master' · 1e8493f5
  Halvor Horge authored Nov 12, 2019
```
#4

See merge request !6
```
  1e8493f5
- #4 · c64a87ac
  Halvor Horge authored Nov 12, 2019
  
  c64a87ac
- Merge branch 'backendDev' into 'master' · 479986c0
  Halvor Horge authored Nov 12, 2019
```
#4 We can now display information from the backend in the front end

See merge request !5
```
  479986c0
- #4 We can now display information from the backend in the front end · 6e195ee8
  Halvor Horge authored Nov 12, 2019
  
  6e195ee8
- Attempt at hamburgermenu · 186a6fff
  Halvor Horge authored Nov 12, 2019
  
  186a6fff
11 Nov, 2019 1 commit
- Update README.md · f07f031e
  Joakim Hantho Qvale authored Nov 11, 2019
  
  f07f031e