Commits · master · Ole Gabor Husebø / rodtrad

17 Apr, 2020 7 commits
- Update readme.md (rettskriving) · 9bda74a4
  Ole Gabor Husebø authored Apr 17, 2020
  
  9bda74a4
- Update readme.md · 74c59f4a
  Hildegunn Elin Olaussen Nedregård authored Apr 17, 2020
  
  74c59f4a
- Update readme.md · cb0c74a1
  Hildegunn Elin Olaussen Nedregård authored Apr 17, 2020
  
  cb0c74a1
- Update readme.md · d0fd794f
  Hildegunn Elin Olaussen Nedregård authored Apr 17, 2020
  
  d0fd794f
- Update readme.md · 2a9c0a4f
  Hildegunn Elin Olaussen Nedregård authored Apr 17, 2020
  
  2a9c0a4f
- Update readme.md · 44e2992a
  Sander Elias Høyland authored Apr 17, 2020
  
  44e2992a
- Update readme.md · 9406c126
  Sander Elias Høyland authored Apr 17, 2020
  
  9406c126
16 Apr, 2020 3 commits
- Update readme.md · 1d5b7536
  Sander Elias Høyland authored Apr 16, 2020
  
  1d5b7536
- Update readme.md · b2611fdd
  Sander Elias Høyland authored Apr 16, 2020
  
  b2611fdd
- Update readme.md · 8d64a93c
  Sander Elias Høyland authored Apr 16, 2020
  
  8d64a93c
15 Apr, 2020 11 commits
- Update readme.md · 658d9d03
  Sander Elias Høyland authored Apr 15, 2020
  
  658d9d03
- Update readme.md · 4ec70349
  Sander Elias Høyland authored Apr 15, 2020
  
  4ec70349
- Update readme.md · 9053462c
  Sander Elias Høyland authored Apr 15, 2020
  
  9053462c
- Update readme.md · de0890a9
  Sander Elias Høyland authored Apr 15, 2020
  
  de0890a9
- Update readme.md · ba428de7
  Sander Elias Høyland authored Apr 15, 2020
  
  ba428de7
- Update readme.md · 1f7a495c
  Sander Elias Høyland authored Apr 15, 2020
  
  1f7a495c
- Nye screenshots · ca9d34fc
  Sander Høyland authored Apr 15, 2020
  
  ca9d34fc
- Merge branch 'master-lokal-sqlite' into 'master' · 723e5c59
  Sander Elias Høyland authored Apr 15, 2020
```
Master lokal sqlite

See merge request tdt4140-2020/58!11
```
  723e5c59
- Update readme.md · 9604f0af
  Sander Elias Høyland authored Apr 15, 2020
  
  9604f0af
- fixed challange name · 38314e80
  Silje Odland authored Apr 15, 2020
  
  38314e80
- fixed small issues · 79667251
  Silje Odland authored Apr 15, 2020
  
  79667251
14 Apr, 2020 4 commits
- Update readme.md · 180d0c75
  Sander Elias Høyland authored Apr 14, 2020
  
  180d0c75
- Update readme.md · 0a8a5c41
  Sander Elias Høyland authored Apr 14, 2020
  
  0a8a5c41
- Update readme.md · f78dee22
  Sander Elias Høyland authored Apr 14, 2020
  
  f78dee22
- Add experimental README.md · 41d2070c
  Sander Elias Høyland authored Apr 14, 2020
  
  41d2070c
10 Apr, 2020 1 commit
- fixed design, made not interested · ea545a69
  Silje Odland authored Apr 10, 2020
  
  ea545a69
07 Apr, 2020 6 commits
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Merge branch 'master' · 7da489e3
  Sander Høyland authored Apr 07, 2020
  
  7da489e3
- Endret tilbake til MYSQL-database · aebe02f3
  Sander Høyland authored Apr 07, 2020
  
  aebe02f3
- Merge branch 'fixingSearchBug' into 'master-lokal-sqlite' · 6c2f5740
  Hildegunn Elin Olaussen Nedregård authored Apr 07, 2020
```
Fixing search bug

See merge request tdt4140-2020/58!10
```
  6c2f5740
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create baseRefactoring.xml · c086f13d
  Sander Høyland authored Apr 07, 2020
  
  c086f13d
- Merge branch 'fixingSearchBug' into 'master' · 72684155
  Hildegunn Elin Olaussen Nedregård authored Apr 07, 2020
```
Fixing search bug

See merge request tdt4140-2020/58!9
```
  72684155
- Bug fixed · 6f60553d
  Hildegunn Elin Olaussen Nedregård authored Apr 07, 2020
  
  6f60553d
25 Mar, 2020 3 commits
- Changed settings to use sqlite database instead of mysql database · 66840a7b
  Sander Elias Høyland authored Mar 25, 2020
  
  66840a7b
- Merge branch 'la-bruker-endre-tema' into 'master' · 84b46d12
  Sander Elias Høyland authored Mar 25, 2020
```
Gir mulighet for å endre tema på siden

See merge request tdt4140-2020/58!8
```
  84b46d12
- Merge branch 'master' into 'la-bruker-endre-tema' · 2490b44c
  Sander Elias Høyland authored Mar 25, 2020
```
# Conflicts:
#   rodTraa/Templates/myprofile.html
```
  2490b44c
24 Mar, 2020 1 commit
- Bilde av arkitektur til bruk i wiki · 3977d124
  Hildegunn Elin Olaussen Nedregård authored Mar 24, 2020
  
  3977d124
23 Mar, 2020 4 commits
- Fikset feil ved tidligere merging · b59cf847
  Sander Høyland authored Mar 23, 2020
  
  b59cf847
- Merge remote-tracking branch 'origin/Tilbakestill_passord' · a53ac296
  Sander Høyland authored Mar 23, 2020
```
# Conflicts:
#	rodTraa/apps/feed/migrations/0001_initial.py
#	rodTraa/apps/users/migrations/0001_initial.py
```
  a53ac296
- Justerte front end, nytt passord siden · 07666c38
  Ole Gabor Husebø authored Mar 23, 2020
  
  07666c38
- Gir mulighet til å tilbakestille passord og lage nytt. · e6a0ff3d
  Ole Gabor Husebø authored Mar 23, 2020
  
  e6a0ff3d