Commits · 3977d124a18d835e873306c19b188259306eaa47 · Ole Gabor Husebø / rodtrad

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
22 Mar, 2020 3 commits
- Merge branch '#24-add-search' into 'master' · 94a0c83a
  Hildegunn Elin Olaussen Nedregård authored Mar 22, 2020
```
#24 add search

See merge request tdt4140-2020/58!6
```
  94a0c83a
- Merge branch 'master' into '#24-add-search' · e3edfc72
  Hildegunn Elin Olaussen Nedregård authored Mar 22, 2020
```
# Conflicts:
#   rodTraa/apps/staticpages/views.py
#   rodTraa/apps/users/models.py
#   rodTraa/apps/users/views.py
#   rodTraa/rodTraa/urls.py
```
  e3edfc72
- Added follow button on posts · 919038c1
  Hildegunn Elin Olaussen Nedregård authored Mar 22, 2020
  
  919038c1
21 Mar, 2020 1 commit

Koblet opp til online database på mysqladmin.stud.ntnu.no. Databasen kan sees... · 4dbe8573

Sander Høyland authored Mar 21, 2020

Koblet opp til online database på mysqladmin.stud.ntnu.no. Databasen kan sees ved å skrive inn brukernavn og passord som ligger settings.py

4dbe8573

20 Mar, 2020 2 commits
- finish likes, event and interested in event · b643cafa
  Silje Odland authored Mar 20, 2020
  
  b643cafa
- finish likes, event and interested in event · 26000205
  Silje Odland authored Mar 20, 2020
  
  26000205
18 Mar, 2020 1 commit
- Added follow button on posts · 127713ea
  Hildegunn Elin Olaussen Nedregård authored Mar 18, 2020
  
  127713ea
15 Mar, 2020 1 commit
- fixed profilepicture, fixed editProfile form · 8accf2e9
  Silje Odland authored Mar 15, 2020
  
  8accf2e9
10 Mar, 2020 6 commits
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Merge branch 'master' · 452d0252
  Sander Høyland authored Mar 10, 2020
  
  452d0252
- Merge branch '#19-writing-tests' into 'master' · c678031c
  Hildegunn Elin Olaussen Nedregård authored Mar 10, 2020
```
Made tests for users and feed

See merge request tdt4140-2020/58!4
```
  c678031c
- Merge branch 'master' into '#19-writing-tests' · 60423377
  Hildegunn Elin Olaussen Nedregård authored Mar 10, 2020
```
# Conflicts:
#   rodTraa/Templates/myprofile.html
#   rodTraa/apps/users/forms.py
#   rodTraa/apps/users/models.py
```
  60423377
- Made tests for users and feed · fb00b7d7
  Hildegunn Elin Olaussen Nedregård authored Mar 10, 2020
  
  fb00b7d7
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Update Default.xml · 6f63e48f
  Sander Høyland authored Mar 10, 2020
  
  6f63e48f
- profile fix and delete post · 761b5ee9
  Silje Odland authored Mar 10, 2020
  
  761b5ee9
09 Mar, 2020 3 commits
- Merge branch 'editUserProfile' · 3a2c4f78
  Silje Odland authored Mar 09, 2020
  
  3a2c4f78
- Revert "edit profile finish" · a5289739
  Silje Odland authored Mar 09, 2020
```
This reverts commit dfe43c60
```
  a5289739
- edit profile finish · dfe43c60
  Silje Odland authored Mar 09, 2020
  
  dfe43c60
04 Mar, 2020 1 commit
- edit profile finish · 64d3d5e9
  Silje Odland authored Mar 04, 2020
  
  64d3d5e9
03 Mar, 2020 6 commits
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create keymap.xml, Windows Proper Redo.xml · fcd9168b
  Sander Høyland authored Mar 03, 2020
  
  fcd9168b
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Update vcs.xml · f7e99e11
  Sander Høyland authored Mar 03, 2020
  
  f7e99e11
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Merge branch 'master' · 56d525e6
  Sander Høyland authored Mar 03, 2020
  
  56d525e6
- Moving user to top of post. · 9243d1fc
  Ole Gabor Husebø authored Mar 03, 2020
  
  9243d1fc
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create vcs.xml · da3a5cbd
  Sander Høyland authored Mar 03, 2020
  
  da3a5cbd
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create Default.xml, colors.scheme.xml,... · 884ffae1
  Sander Høyland authored Mar 03, 2020
```
PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create Default.xml, colors.scheme.xml, laf.xml, databaseDrivers.xml, Default.xml, debugger.xml
```
  884ffae1
28 Feb, 2020 3 commits
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Merge branch 'master' · 287d1ea6
  Sander Høyland authored Feb 28, 2020
  
  287d1ea6
- improvement of design · b03374eb
  Silje Odland authored Feb 28, 2020
  
  b03374eb
- PY-2019.3.3 <guffb@DESKTOP-F1O6115 Create find.xml, wsl.distributions.xml · e320d868
  Sander Høyland authored Feb 28, 2020
  
  e320d868
27 Feb, 2020 2 commits
- removes .idea · 18396d48
  Silje Odland authored Feb 27, 2020
  
  18396d48
- adds user types, posts, login and logout functionality · da469dd5
  Silje Odland authored Feb 27, 2020
  
  da469dd5
25 Feb, 2020 5 commits
- Merge branch '#1-registrere-bruker' into 'master' · 316ec013
  Hildegunn Elin Olaussen Nedregård authored Feb 25, 2020
```
Edited links on login page.

See merge request tdt4140-2020/58!3
```
  316ec013
- Edited links on login page. · eb859101
  Benedicte Chen Vestrum authored Feb 25, 2020
  
  eb859101
- Merge branch 'Ole's_Branch' into 'master' · a52fb609
  Sander Elias Høyland authored Feb 25, 2020
```
Ole's branch

See merge request tdt4140-2020/58!2
```
  a52fb609
- Merge branch 'master' into 'Ole's_Branch' · 88028866
  Sander Elias Høyland authored Feb 25, 2020
```
# Conflicts:
#   rodTraa/rodTraa/urls.py
```
  88028866
- Creating User registration page. (not finished) · 39982a74
  Ole Gabor Husebø authored Feb 25, 2020
  
  39982a74
24 Feb, 2020 1 commit
- removes knitter-model, fixes user registration · bcac9f60
  Silje Odland authored Feb 24, 2020
  
  bcac9f60