Commits · feature/localBuildingWorksAgain · Andreas Jensen Jonassen / tdt4242-base · GitLab

05 Mar, 2021 25 commits
- Make local development work again · 2ef2bfea
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  2ef2bfea
- Merge branch 'feature/exercise-fileupload' into 'master' · 1dbe45c7
  Andreas Jensen Jonassen authored Mar 05, 2021
```
Feature/exercise fileupload

See merge request !2
```
  1dbe45c7
- Move prod host to a variable · 7a5ed14f
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  7a5ed14f
- Merge branch 'master' into 'feature/exercise-fileupload' · 1bb0c6f5
  Andreas Jensen Jonassen authored Mar 05, 2021
```
# Conflicts:
#   frontend/www/scripts/exercise.js
```
  1bb0c6f5
- Merge branch 'feature/inf-scroll' into 'master' · e2f477a2
  Andreas Jensen Jonassen authored Mar 05, 2021
```
Infinite scroll

See merge request !3
```
  e2f477a2
- Merge branch 'master' into 'feature/inf-scroll' · 29f7cd0f
  Andreas Jensen Jonassen authored Mar 05, 2021
```
# Conflicts:
#   frontend/www/scripts/exercises.js
```
  29f7cd0f
- Merge branch 'feature/toast' into 'master' · 8bf89ad8
  Liam Svanåsbakken Crouch authored Mar 05, 2021
```
Alerts show as toasts

See merge request !4
```
  8bf89ad8
- Move deploy back to the deploy stage · 371e8309
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  371e8309
- Test log backup · d883427e
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  d883427e
- Removed commented out stuff in before_script · 85000593
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  85000593
- Move deploy to the correct place in the pipeline · 04c555e4
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  04c555e4
- fix permissions on private key so ssh is happy · 1b7cdca0
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  1b7cdca0
- Attempt at auto-deploying · 167508df
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  167508df
- Convert the application to work well in a single-application deployment · 4041da68
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  4041da68
- refactor - use CI variables · ef30710d
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  ef30710d
- Make sure docker image pulling doesnt stop the build · dcf0e375
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  dcf0e375
- Add backend testing, and more container building · 7814ad15
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  7814ad15
- change image · 56b4aabc
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  56b4aabc
- some config tweaks · a9c5f4f0
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  a9c5f4f0
- use our own runner · b2ff58f6
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  b2ff58f6
- Try to use the docker tag · d96a36a4
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  d96a36a4
- Another attempt at making CI work nicely with unprivileged containers · 7f2c4a19
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  7f2c4a19
- Attempt at making the docker container building work without privileged container running · 95363567
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  95363567
- Use correct variable names · 089dd8a1
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  089dd8a1
- Attempt new building process using my own registry · cdec9474
  Liam Svanåsbakken Crouch authored Mar 05, 2021
  
  cdec9474
04 Mar, 2021 5 commits
- Merge branch 'master' of gitlab.stud.idi.ntnu.no:andreajj/tdt4242-base · ef05265c
  Liam Svanåsbakken Crouch authored Mar 04, 2021
  
  ef05265c
- Update gitlab-ci.yml · 8012ca4b
  Liam Svanåsbakken Crouch authored Mar 04, 2021
  
  8012ca4b
- Merge branch 'tests/permissions' into 'master' · e870ac3b
  Sondre Strand Haltbakk authored Mar 04, 2021
```
Added tests for workout permissions

See merge request !5
```
  e870ac3b
- Added tests for workout permissions · 4675de75
  Andreas Jensen Jonassen authored Mar 04, 2021 and Sondre Strand Haltbakk committed Mar 04, 2021
  
  4675de75
- Replace with new gitlab ci · a9d5a799
  Liam Svanåsbakken Crouch authored Mar 04, 2021
  
  a9d5a799
03 Mar, 2021 1 commit
- Fix bug of djangoHeroku import in wrong file. · 37f14a8e
  asmundh authored Mar 03, 2021
  
  37f14a8e
02 Mar, 2021 1 commit
- Add instructions for CI/CD with Heroku · 1467c014
  asmundh authored Mar 02, 2021
  
  1467c014
01 Mar, 2021 4 commits
- Reword logout message · b50f8789
  Liam Svanåsbakken Crouch authored Mar 01, 2021
  
  b50f8789
- Add login success message to logout.js · 7eef0757
  Liam Svanåsbakken Crouch authored Mar 01, 2021
  
  7eef0757
- Add success toasts to login, as you are redirected into the app · 0387312a
  Liam Svanåsbakken Crouch authored Mar 01, 2021
  
  0387312a
- Refactor most javascript to use the toast system · ce41861b
  Liam Svanåsbakken Crouch authored Mar 01, 2021
  
  ce41861b
25 Feb, 2021 3 commits
- Initial commit of toast logic · cebb3ad9
  Liam Svanåsbakken Crouch authored Feb 25, 2021
  
  cebb3ad9
- Update exercises.js · f2be0783
  Andreas Jensen Jonassen authored Feb 25, 2021
  
  f2be0783
- Added feature code · 9111551e
  Andreasjj authored Feb 25, 2021
  
  9111551e
23 Feb, 2021 1 commit
- Fixed frontend · f8f459b1
  Andreasjj authored Feb 23, 2021
  
  f8f459b1