Commits · 25b1c189ecd8d21480b23112e968e1f29e9d078c · fz2907 / SwitchRoom

Nov 27, 2022
- Change == to equals · 25b1c189
  fz2907 authored 2 years ago
  
  25b1c189
- Merge remote-tracking branch 'origin/agreement_next' into sprint_3 · 2337c5aa
  fz2907 authored 2 years ago
  
  # Conflicts: # BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java # BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/MatchedWishlistRecordService.java
  2337c5aa
- update new backend of agreement · d332d558
  zhengbo authored 2 years ago
  
  d332d558
Nov 26, 2022
- Merge remote-tracking branch 'origin/comment_feature' into sprint_3 · 90611eb7
  fz2907 authored 2 years ago
  
  # Conflicts: # BackendFolder/SwitchRoom/src/main/resources/application.properties
  90611eb7
- Comment basic feature is done, need more testing and some help UI · d99743eb
  fz2907 authored 2 years ago
  
  d99743eb
- Merge branch 'dev_chou' into 'sprint_3' · 5d11dc08
  fz2907 authored 2 years ago
  
  add reset password feature See merge request !35
  5d11dc08
- Merge branch 'sprint_3' into 'dev_chou' · cc1566db
  Ju Yu Chou Fu authored 2 years ago
  
  # Conflicts: # FrontendFolder/switch-room/src/services/UserService.ts
  cc1566db
Nov 25, 2022
- Comment basic feature is done, need more testing and some help UI · 03635942
  fz2907 authored 2 years ago
  
  03635942
- history main body started · 83562a04
  fz2907 authored 2 years ago
  
  83562a04
Nov 24, 2022
- Start AgreedMatchPage to show the ongoing matches and history matches for user... · 6836f07a
  fz2907 authored 2 years ago
  
  Start AgreedMatchPage to show the ongoing matches and history matches for user give rating and comments
  6836f07a
- Added cleanup job, so when the agreement is done they can start give rating · e133ff1a
  fz2907 authored 2 years ago
  
  e133ff1a
Nov 23, 2022
- Merge remote-tracking branch 'origin/sprint_3' into comment_feature · c878f527
  fz2907 authored 2 years ago
  
  c878f527
- Add AgreedRecordTable, used as history table, and offer time check table · 0de6d179
  fz2907 authored 2 years ago
  
  0de6d179
- UI update of matched result page · 63ae5ae4
  zhengbo authored 2 years ago
  
  63ae5ae4
Nov 22, 2022
- add reset password feature · fc75216f
  Bart Chou authored 2 years ago
  
  fc75216f
Nov 13, 2022
- Merge branch 'sprint_2' into 'main' · 4f5ac82e
  fz2907 authored 2 years ago
  
  Sprint 2 done See merge request !34
  4f5ac82e
- Merge branch 'footer_style' into 'sprint_2' · 19fcca1e
  fz2907 authored 2 years ago
  
  Solve the footer float problem See merge request !33
  19fcca1e
Nov 10, 2022
- Solve the footer float problem · c2ade827
  zhengbo authored 2 years ago
  
  c2ade827
- add flight api json · 29bb4a7c
  fanz8 authored 2 years ago
  
  29bb4a7c
Nov 07, 2022
- Merge branch 'FlightTicket' into 'sprint_2' · a2849571
  fz2907 authored 2 years ago
  
  add flight ticket part See merge request !32
  a2849571
- add flight ticket part · 94565b22
  fanz8 authored 2 years ago
  
  94565b22
- Offer page delete offer item UI change · 37c5b463
  fz2907 authored 2 years ago
  
  37c5b463
Nov 06, 2022
- Merge remote-tracking branch 'origin/notification_bilibili' into sprint_2 · 52fd9bbe
  fz2907 authored 2 years ago
  
  52fd9bbe
- UI change · 42481452
  fz2907 authored 2 years ago
  
  42481452
- update notifications · ec8cae73
  zhengbo authored 2 years ago
  
  ec8cae73
- Fixed login issue · 09297ec5
  fz2907 authored 2 years ago
  
  09297ec5
- Change matchedWishlistRecordRepository.findBy... to findAllBy... · 61e261ee
  fz2907 authored 2 years ago
  
  61e261ee
- Merge remote-tracking branch 'origin/notification_new' into sprint_2 · fea24896
  fz2907 authored 2 years ago
  
  # Conflicts: # BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java # FrontendFolder/switch-room/src/App.vue # FrontendFolder/switch-room/src/components/AppHeader.vue # FrontendFolder/switch-room/src/components/WishlistPage.vue # FrontendFolder/switch-room/src/router/index.ts
  fea24896
- Merge remote-tracking branch 'origin/matching_service' into sprint_2 · 1b5e51ea
  fz2907 authored 2 years ago
  
  1b5e51ea
- Merge remote-tracking branch 'origin/login_cookie' into sprint_2 · e16ba736
  fz2907 authored 2 years ago
  
  e16ba736
Nov 05, 2022
- new update · 05c460fd
  zhengbo authored 2 years ago
  
  05c460fd
- Offer and Wishlist page match notification UI is ready. · 428a5933
  fz2907 authored 2 years ago
  
  428a5933
- new update · f80beaee
  zhengbo authored 2 years ago
  
  f80beaee
- new update · 7a1bb2c9
  zhengbo authored 2 years ago
  
  7a1bb2c9
- Offer page and Wishlist page are able to fetch the matched records and display... · 7e022205
  fz2907 authored 2 years ago
  
  Offer page and Wishlist page are able to fetch the matched records and display them as list in the UI. Next I need to show number icon on the wishlist cards
  7e022205
- new update · 834be070
  zhengbo authored 2 years ago
  
  834be070
- add a new meta (hideHeader) to decide whether render header in a component · 15e32899
  Bart Chou authored 2 years ago
  
  15e32899
- finish profile · 948de0b7
  Bart Chou authored 2 years ago
  
  948de0b7
- let's go · 567477ee
  zhengbo authored 2 years ago
  
  567477ee
Nov 04, 2022
- Add create, edit and delete button on the wishlist page and tested. · fb9ee85d
  fz2907 authored 2 years ago
  
  Add readonly and disabled to offer and wishlist pages so user only allowed to change in certain state
  fb9ee85d