Commits · 2e991224d846b5148418e5a639d45634eb0c4bff · Ole-Christian Bjerkeset / tdt4242-group16

Mar 11, 2022

Ole-Christian Bjerkeset authored 3 years ago

created models, seralizers and views for the app
added Pillow to requirements for image support

2e991224

Mar 10, 2022
- modified the user app in the backend to support fitness profiles · 268325b2
  Ole-Christian Bjerkeset authored 3 years ago
  
  added functionality for fitness profiles in frontend
  268325b2
Mar 08, 2022
- Merge branch 'fix/permissions' into 'master' · ebc2ecb7
  Ole-Christian Bjerkeset authored 3 years ago
  
  Fix/permissions See merge request !1
  ebc2ecb7
- added some permissions for group and membership views, and added comments · 25791e0d
  Simen authored 3 years ago
  
  25791e0d
Mar 07, 2022
- added functionality for inviting new users to a group · 3378846a
  Simen authored 3 years ago
  
  3378846a
- Added functionality for editing groups, and added groups to navbar · 4ee3e4d3
  Simen authored 3 years ago
  
  4ee3e4d3
- added frontend forms and lists for the group functionality. · 0acaaa83
  Simen authored 3 years ago
  
  0acaaa83
- Added a new backend app, groups. made models and views · abb31f69
  Simen authored 3 years ago
  
  abb31f69
Mar 03, 2022
- feat: update exercise page(testing ci/cd environment) · 463aa635
  Ole-Christian Bjerkeset authored 3 years ago
  
  463aa635
- Setting up the CI/CD environment and adding .idea to gitignore · 7aa6df77
  Ole-Christian Bjerkeset authored 3 years ago
  
  7aa6df77
Jan 10, 2022
- Update README.md clone URL working · 954382ef
  Mathias Lundteigen Mohus authored 3 years ago
  
  954382ef
- Update README.md with proper git clone URL, and added sections on running Docker as admin · a3426b90
  Mathias Lundteigen Mohus authored 3 years ago
  
  a3426b90
Dec 18, 2021
- Update .gitlab-ci.yml · 12c2cc67
  Haakon Gunleiksrud authored 3 years ago
  
  12c2cc67
- Update .gitlab-ci.yml · be9a3fc2
  Haakon Gunleiksrud authored 3 years ago
  
  be9a3fc2
Dec 08, 2021
- feat/update description of exercise form inputs · efa689b3
  Haakon Gunleiksrud authored 3 years ago
  
  efa689b3
Nov 22, 2021
- Merge branch 'feat/workout_image_advanced_gallery' into 'master' · 1667e8c1
  Haakon Gunleiksrud authored 3 years ago
  
  Feat/workout image advanced gallery See merge request !21
  1667e8c1
- Feat/workout image advanced gallery · 0f6502fe
  Haakon Gunleiksrud authored 3 years ago
  
  0f6502fe
Nov 05, 2021
- Merge branch 'devops/setup_live_demo' into 'master' · 7c500bee
  Haakon Gunleiksrud authored 3 years ago
  
  Devops/setup live demo See merge request !20
  7c500bee
- Devops/setup live demo · bee2cf2f
  Haakon Gunleiksrud authored 3 years ago
  
  bee2cf2f
- devops: update the yml to correct heroku apps · 5b571503
  Haakon Gunleiksrud authored 3 years ago
  
  5b571503
- empty build commit · effbe807
  Haakon Gunleiksrud authored 3 years ago
  
  effbe807
- devops: update readme · d9d6d714
  Haakon Gunleiksrud authored 3 years ago
  
  d9d6d714
- devops: move Procfile to root · c2c8f7dd
  Haakon Gunleiksrud authored 3 years ago
  
  c2c8f7dd
Nov 02, 2021
- devops: update yml file to correct heroku app · 47a31977
  Haakon Gunleiksrud authored 3 years ago
  
  47a31977
Oct 29, 2021
- fix: add content to requirements.txt · 5f1bc179
  Haakon Gunleiksrud authored 3 years ago
  
  5f1bc179
- fix: set correct python runtime version · 1ac781ed
  Haakon Gunleiksrud authored 3 years ago
  
  1ac781ed
- fix: heroku deployment · 4631b022
  Haakon Gunleiksrud authored 3 years ago
  
  4631b022
- fix: set python version to 3.9.7 · 31d7ea82
  Haakon Gunleiksrud authored 3 years ago
  
  31d7ea82
- fix: set correct python version in runtime.txt · d10fb1ca
  Haakon Gunleiksrud authored 3 years ago
  
  d10fb1ca
- test: trivial change to test devops · 17cad9a8
  Haakon Gunleiksrud authored 3 years ago
  
  17cad9a8
Oct 28, 2021
- devops/set heroku app names for frontend and backend · b48fb2a6
  Haakon Gunleiksrud authored 3 years ago
  
  b48fb2a6
Oct 20, 2021
- Merge branch 'feat/meal_module' into 'master' · 53695731
  Haakon Gunleiksrud authored 3 years ago
  
  Feat/meal module See merge request !17
  53695731
- Feat/meal module · 928238a1
  Haakon Gunleiksrud authored 3 years ago
  
  928238a1
Oct 18, 2021
- Merge branch 'feat/display_workout_image' into 'master' · 0719e982
  Haakon Gunleiksrud authored 3 years ago
  
  feat/add preview of image in workout if image file See merge request !16
  0719e982
- feat/add preview of image in workout if image file · c5bfcacb
  Haakon Gunleiksrud authored 3 years ago
  
  c5bfcacb
- Merge branch 'feat/addMoreFields' into 'master' · d65fa134
  Haakon Gunleiksrud authored 3 years ago
  
  Feat/add more fields See merge request !15
  d65fa134
- Feat/add more fields · 246bd5fa
  Haakon Gunleiksrud authored 3 years ago
  
  246bd5fa
Mar 03, 2021
- Fix bug of djangoHeroku import in wrong file. · 37f14a8e
  asmundh authored 4 years ago
  
  37f14a8e
Mar 02, 2021
- Add instructions for CI/CD with Heroku · 1467c014
  asmundh authored 4 years ago
  
  1467c014
Feb 08, 2021
- Fix form-bug · d9704ef3
  asmundh authored 4 years ago
  
  d9704ef3