Commits · 76d20502a5c67c6b5a580cd4cafd5289e83dbcc9 · Christopher Collin Løkken / tdt4242-group-13 · GitLab

03 Apr, 2022 1 commit
- moved RememberMe serializer to user + fixed api urls · 76d20502
  Christopher Løkken authored Apr 03, 2022
  
  76d20502
02 Apr, 2022 15 commits
- chore: started refactoring gallery · f9a31555
  Jakob Lund Johannessen authored Apr 02, 2022
  
  f9a31555
- chore: refactor workouts/models · a1b233cb
  Jakob Lund Johannessen authored Apr 02, 2022
  
  a1b233cb
- chore: refactor comments views · ee753da3
  Jakob Lund Johannessen authored Apr 02, 2022
  
  ee753da3
- fix: refactor user views · 27b6c728
  Jakob Lund Johannessen authored Apr 02, 2022
  
  27b6c728
- Merge branch 'chris' into 'master' · f8c97135
  Christopher Collin Løkken authored Apr 02, 2022
```
chore: fix mc

See merge request !3
```
  f8c97135
- Merge branch 'urlrefactor' into 'master' · 758a0f22
  Christopher Collin Løkken authored Apr 02, 2022
```
resolved merge conflict on branch chris

See merge request !6
```
  758a0f22
- Merge branch 'master' into urlrefactor · d41bc047
  Christopher Løkken authored Apr 02, 2022
  
  d41bc047
- Merge branch 'urlrefactor' of gitlab.stud.idi.ntnu.no:chrisclo/tdt-4242-group-13 into urlrefactor · e9e0aadd
  Christopher Løkken authored Apr 02, 2022
  
  e9e0aadd
- fixed linting · 9a899c25
  Christopher Løkken authored Apr 01, 2022
  
  9a899c25
- Pylinting of workout views · 3780067a
  Christopher Løkken authored Apr 01, 2022
  
  3780067a
- refactor: admin · 7b1096cb
  Jakob Lund Johannessen authored Apr 02, 2022
  
  7b1096cb
- fixed import for workout view in urls · 68bbc75b
  Christopher Løkken authored Apr 01, 2022
  
  68bbc75b
- Refactored url config · 80613e48
  Christopher Løkken authored Apr 01, 2022
  
  80613e48
- resolved merge conflict on branch chris · 4393dab8
  Christopher Løkken authored Apr 02, 2022
  
  4393dab8
- Merge branch 'urlrefactor' into 'master' · c0ca65f4
  Christopher Collin Løkken authored Apr 02, 2022
```
Refactored url config

See merge request !4
```
  c0ca65f4
01 Apr, 2022 5 commits
- fixed linting · 2474c53e
  Christopher Løkken authored Apr 01, 2022
  
  2474c53e
- Merge branch 'pylint' into urlrefactor · 1346592e
  Christopher Løkken authored Apr 01, 2022
  
  1346592e
- fixed import for workout view in urls · d032689b
  Christopher Løkken authored Apr 01, 2022
  
  d032689b
- Pylinting of workout views · c15ff9b5
  Christopher Løkken authored Apr 01, 2022
  
  c15ff9b5
- Refactored url config · 0a4ba94a
  Christopher Løkken authored Apr 01, 2022
  
  0a4ba94a
22 Mar, 2022 16 commits
- Merge branch 'master' of gitlab.stud.idi.ntnu.no:chrisclo/tdt-4242-group-13 · 73e26036
  Christopher Løkken authored Mar 22, 2022
  
  73e26036
- pushing some final stuff · c3d2a4c5
  Christopher Løkken authored Mar 22, 2022
  
  c3d2a4c5
- task 3 2 way domain integration testing 100% cypress test · ed9d8b7e
  Christopher Løkken authored Mar 22, 2022
  
  ed9d8b7e
- chore: rename test · d8acf47f
  Jakob Lund Johannessen authored Mar 22, 2022
  
  d8acf47f
- pushing some final stuff · 97a609f6
  Christopher Løkken authored Mar 22, 2022
  
  97a609f6
- fix: run linter · 629a93a3
  Jakob Lund Johannessen authored Mar 22, 2022
  
  629a93a3
- chore: remove cypress form ci · 9eb57c51
  Jakob Lund Johannessen authored Mar 22, 2022
  
  9eb57c51
- chore: remove unnessesary should requirement · b3253146
  Jakob Lund Johannessen authored Mar 22, 2022
  
  b3253146
- task 3 2 way domain integration testing 100% cypress test · ad296a00
  Christopher Løkken authored Mar 22, 2022
  
  ad296a00
- chore: add integration tests for new features · f56d00aa
  Jakob Lund Johannessen authored Mar 22, 2022
  
  f56d00aa
- chore: add fr5 test · 834aadd7
  Jakob Lund Johannessen authored Mar 22, 2022
  
  834aadd7
- fix: use node image in order to not install npm on every run · d09d3767
  Jakob Lund Johannessen authored Mar 22, 2022
  
  d09d3767
- Merge branch 'master' of gitlab.stud.idi.ntnu.no:chrisclo/tdt-4242-group-13 · 482d2d00
  Christopher Løkken authored Mar 22, 2022
  
  482d2d00
- cypress 2way domain integration test · 3ee8c2de
  Christopher Løkken authored Mar 22, 2022
  
  3ee8c2de
- Revert "feat: use docker compose for cypress tests" and run cypress in... · 15024f6e
  Jakob Lund Johannessen authored Mar 22, 2022
```
Revert "feat: use docker compose for cypress tests" and run cypress in production environment with mocked bff requests

This reverts commit 5783fdd1.
```
  15024f6e
- feat: use docker compose for cypress tests · 5783fdd1
  Jakob Lund Johannessen authored Mar 22, 2022
  
  5783fdd1
21 Mar, 2022 3 commits
- Merge branch 'feat/cypress' into 'master' · 86306164
  Jakob Lund Johannessen authored Mar 21, 2022
```
Feat/cypress

See merge request !2
```
  86306164
- Feat/cypress · 2c2b56be
  Jakob Lund Johannessen authored Mar 21, 2022
  
  2c2b56be
- Merge branch 'master' of gitlab.stud.idi.ntnu.no:chrisclo/tdt-4242-group-13 · ba0b508f
  Christopher Løkken authored Mar 21, 2022
  
  ba0b508f