Commits · develop · IT2810-H19 / Teams / Team 60 / project2

27 Sep, 2019 11 commits
- Merge branch 'fuckme/funkaItjAAPushe' into 'develop' · 866342f9
  Alexander Orvik authored Sep 27, 2019
```
This branch should work

See merge request !38
```
  866342f9
- Merge branch 'fix/merge-master' into develop · f18775af
  Mathias Chunnoo authored Sep 27, 2019
  
  f18775af
- Merge branch 'hotfix/readme-branch-fix' into 'develop' · 2fef06a8
  Alexander Orvik authored Sep 27, 2019
```
Hotfix/readme branch fix

See merge request !36
```
  2fef06a8
- Test fix · 5d230642
  Alexander Orvik authored Sep 27, 2019
  
  5d230642
- Fix accidentally not saved change · b9e8b0d1
  Alexander Orvik authored Sep 27, 2019
  
  b9e8b0d1
- Merge branch 'readme-branch-repair' into develop · 651e0d23
  Alexander Orvik authored Sep 27, 2019
  
  651e0d23
- testing mobil enhet · 87d26a07
  haavapet authored Sep 27, 2019
  
  87d26a07
- Update snapshot · d26983f7
  Alexander Orvik authored Sep 27, 2019
  
  d26983f7
- misc README formatting fix · dbcf20b0
  Alexander Orvik authored Sep 27, 2019
  
  dbcf20b0
- Add section for deployment · ec20caa9
  Alexander Orvik authored Sep 27, 2019
  
  ec20caa9
- Merge branch 'feature/session-refresh' into 'master' · 86593425
  Håvard Pettersen authored Sep 27, 2019
```
tabs lasting through reload, some comments

See merge request !33
```
  86593425
26 Sep, 2019 17 commits
- session storage · cdf7a46b
  Mathias Chunnoo authored Sep 27, 2019
  
  cdf7a46b
- tabs lasting through reload, some comments · 81e64b8f
  Mathias Chunnoo authored Sep 27, 2019
  
  81e64b8f
- ajax/caching and some other small things · 00b4312a
  Mathias Chunnoo authored Sep 27, 2019
  
  00b4312a
- fix · edefd816
  haavapet authored Sep 26, 2019
  
  edefd816
- dokumentasjon · 43612547
  haavapet authored Sep 26, 2019
  
  43612547
- Merge branch 'develop' into 'master' · 0dd441f4
  Alexander Orvik authored Sep 26, 2019
```
Final version

See merge request !32
```
  0dd441f4
- Bootstrap project structure · 673a8b18
  Alexander Orvik authored Sep 26, 2019
```
Refactor structure in terms of routing, add hot reloading
and storing media
```
  673a8b18
- Merge branch 'feature/code-cleanup' into 'develop' · b2f00beb
  Alexander Orvik authored Sep 26, 2019
```
Remove deprecated files

See merge request !31
```
  b2f00beb
- Merge branch 'feature/fixFavorite' into 'develop' · 2839070c
  Alexander Orvik authored Sep 26, 2019
```
hotfixed the save/load favorite functions

See merge request !30
```
  2839070c
- Remove deprecated files · 8279ae59
  Alexander Orvik authored Sep 26, 2019
  
  8279ae59
- hotfixed the save/load favorite functions · 0192f4af
  haavapet authored Sep 26, 2019
  
  0192f4af
- Merge branch 'fix/snapshot' into 'develop' · d9912692
  Mathias Chunnoo authored Sep 26, 2019
```
update snapshot

See merge request !29
```
  d9912692
- update snapshot · 5a5d08b8
  Mathias Chunnoo authored Sep 26, 2019
  
  5a5d08b8
- Merge branch 'feature/changeMediaOnTab' into 'develop' · cb8815b7
  Mathias Chunnoo authored Sep 26, 2019
```
change poem and sound when tab change

See merge request !27
```
  cb8815b7
- Merge branch 'hotfix/poem-edit' into 'develop' · c9e9a10f
  Alexander Orvik authored Sep 26, 2019
```
Change poem content

See merge request !28
```
  c9e9a10f
- Change poem content · db04e2e2
  Alexander Orvik authored Sep 26, 2019
  
  db04e2e2
- fixed some css · 3c4caf49
  haavapet authored Sep 26, 2019
  
  3c4caf49
25 Sep, 2019 12 commits
- made the different medias related to which tab they belong to, so when ou... · aa7fdde1
  haavapet authored Sep 25, 2019
```
made the different medias related to which tab they belong to, so when ou change tab, you get a new combination of the medias
```
  aa7fdde1
- Merge branch 'feature/txt-to-json' into 'develop' · f8df0aa0
  Håvard Pettersen authored Sep 25, 2019
```
changes poems from .txt to .json, fixed config show/hide for desktop

See merge request !25
```
  f8df0aa0
- Merge branch 'develop' into feature/txt-to-json · 06076ba6
  Mathias Chunnoo authored Sep 25, 2019
  
  06076ba6
- Merge branch 'feature/changeMediaOnTabs' into 'develop' · 7b6f0a26
  Mathias Chunnoo authored Sep 25, 2019
```
Feature/change media on tabs

See merge request !26
```
  7b6f0a26
- snapshot update · a98303e6
  Mathias Chunnoo authored Sep 25, 2019
  
  a98303e6
- Merge branch 'develop' into 'feature/changeMediaOnTabs' · ea371911
  Håvard Pettersen authored Sep 25, 2019
```
# Conflicts:
#   src/components/InteractiveDisplayContainer.jsx
#   src/components/display/DisplayArt.jsx
```
  ea371911
- added more poems · 3ee3281c
  Mathias Chunnoo authored Sep 25, 2019
  
  3ee3281c
- change pictures when changing tabs · a623b4ee
  haavapet authored Sep 25, 2019
  
  a623b4ee
- added some poems · 24f008e0
  Mathias Chunnoo authored Sep 25, 2019
  
  24f008e0
- Updated README.md · 27bb0ebf
  Alexander Orvik authored Sep 25, 2019
  
  27bb0ebf
- snapshot update · bd7a68af
  Mathias Chunnoo authored Sep 25, 2019
  
  bd7a68af
- Merge branch 'feature/txt-to-json' of... · 0b11b7c0
  Mathias Chunnoo authored Sep 25, 2019
```
Merge branch 'feature/txt-to-json' of https://gitlab.stud.idi.ntnu.no/IT2810-H19/teams/team-60/project2 into feature/txt-to-json
```
  0b11b7c0