Commits · d068d24bb9b27f45189d42c94b5bd3fe008dbb30 · CSE6 / frozen

Feb 16, 2023
- Changed the brand name and added a simple navigation bar · d068d24b
  MikaelKrats authored 2 years ago
  
  d068d24b
- Merge branch 'bidding_frontend_backend_integration_fixes' into 'main' · bbf6222d
  arwunder authored 2 years ago
  
  Bidding frontend backend integration fixes See merge request !41
  bbf6222d
- view current bid instead of starting price · 043eb5cc
  Arno Wunderlich authored 2 years ago
  
  043eb5cc
- bidding backend frontend integration · 19f8c59f
  Arno Wunderlich authored 2 years ago
  
  19f8c59f
- add image to detail view · 697dcaf7
  Arno Wunderlich authored 2 years ago
  
  697dcaf7
Feb 15, 2023
- Merge branch 'bidPage' into 'main' · d9bef7ed
  ramaland authored 2 years ago
  
  biding page See merge request !40
  d9bef7ed
- biding page · b7660451
  ramaland authored 2 years ago
  
  b7660451
- Merge branch 'backend-for-item-showing-and-bidding' into 'main' · aadbeaf6
  arwunder authored 2 years ago
  
  backend without frontend implementation See merge request !39
  aadbeaf6
- backend without frontend implementation · 25fafa51
  Arno Wunderlich authored 2 years ago
  
  25fafa51
Feb 14, 2023
- Merge branch 'create-rest-api' into 'main' · 140b037d
  arwunder authored 2 years ago
  
  Create rest api See merge request !38
  140b037d
- added api bidding · 661c4b5d
  Arno Wunderlich authored 2 years ago
  
  661c4b5d
- added Bid db model · eddea8e4
  Arno Wunderlich authored 2 years ago
  
  eddea8e4
- added token generation to reporting guideline · c66b7de6
  Arno Wunderlich authored 2 years ago
  
  c66b7de6
- Merge branch 'rest-api-do-not-merge-yet' into 'main' · 96134983
  arwunder authored 2 years ago
  
  Rest api do not merge yet See merge request !37
  96134983
- add flask_babbel to requirements.txt · 4164cc1b
  Arno Wunderlich authored 2 years ago
  
  4164cc1b
- fix problems with _ · 2b857a7d
  Arno Wunderlich authored 2 years ago
  
  2b857a7d
- Merge branch 'reporting-guideline1' into 'main' · 22a74d6c
  mikrats authored 2 years ago
  
  updated the reporting guideline See merge request !36
  22a74d6c
- updated the reporting guideline · 22bee285
  MikaelKrats authored 2 years ago
  
  22bee285
Feb 13, 2023
- Merge branch 'reporting-guideline' into 'main' · da6ef234
  mikrats authored 2 years ago
  
  Reporting guideline See merge request !35
  da6ef234
- added titles to read me · 5ffd66e5
  MikaelKrats authored 2 years ago
  
  5ffd66e5
- Added the repoting guideline · 51a14a70
  MikaelKrats authored 2 years ago
  
  51a14a70
- fix tokens.html · 1b498dd0
  Arno Wunderlich authored 2 years ago
  
  1b498dd0
- initial token generation · 1e2c5a91
  Arno Wunderlich authored 2 years ago
  
  1e2c5a91
- Merge branch 'only-list-open-items' into 'main' · aca677f7
  arwunder authored 2 years ago
  
  filter for items See merge request !34
  aca677f7
- filter for items · f91a1f84
  Arno Wunderlich authored 2 years ago
  
  f91a1f84
- Merge branch 'fix-listBid' into 'main' · 80ddc891
  arwunder authored 2 years ago
  
  rix listBid See merge request !33
  80ddc891
- rix listBid · 9145af6b
  Arno Wunderlich authored 2 years ago
  
  9145af6b
- Merge branch 'weekly-report' into 'main' · 8fad8a07
  mikrats authored 2 years ago
  
  Added weekly report for week 3 See merge request !32
  8fad8a07
- Added weekly report for week 3 · 7907ef46
  MikaelKrats authored 2 years ago
  
  7907ef46
- fixing changes · 2edc5974
  ratyann authored 2 years ago
  
  2edc5974
- Merge branch 'main' of https://gitlab.jyu.fi/cse6/cse-6 · a59d397d
  ratyann authored 2 years ago
  
  a59d397d
- fix listbid page · 88d5eba0
  ratyann authored 2 years ago
  
  88d5eba0
- Merge branch 'profile' into 'main' · 45bf0797
  mikrats authored 2 years ago
  
  profile page See merge request !29
  45bf0797
- Merge branch 'reset-gitlab-ci' into 'main' · e3a610d9
  arwunder authored 2 years ago
  
  tempoary reset See merge request !31
  e3a610d9
- Merge branch 'main' into 'reset-gitlab-ci' · cdd79551
  arwunder authored 2 years ago
  
  # Conflicts: # .gitlab-ci.yml
  cdd79551
- tempoary reset · 9db5775b
  Arno Wunderlich authored 2 years ago
  
  9db5775b
- Merge branch 'add-staging-stage' into 'main' · 93d4855f
  arwunder authored 2 years ago
  
  Add staging stage See merge request !30
  93d4855f
- corrected intendation again · 14b70d47
  Arno Wunderlich authored 2 years ago
  
  14b70d47
- changed intendation · a5abddf5
  Arno Wunderlich authored 2 years ago
  
  a5abddf5
- modify gitlab-ci-yml · 8fd2f105
  Arno Wunderlich authored 2 years ago
  
  8fd2f105