Commits · main · IMTA_INTERN / Booking-online-FE · GitLab

Jul 07, 2024
- chore: resolve conflict · 73a83243
  Tuan Anh authored Jul 07, 2024
  
  73a83243
Jul 06, 2024
- chore: added more translation · eb0be776
  QuangMphann authored Jul 07, 2024
  
  eb0be776
- chore: merge branch fix/google-iframe · 7b82c43d
  QuocDL authored Jul 06, 2024
  
  7b82c43d
- Merge branch 'feat/filter' of https://gitlab.com/imta_intern/booking-online-fe into feat/filter · c0f1c917
  QuangMphann authored Jul 06, 2024
  
  c0f1c917
- chore: merge branch fix/google-iframe · fcac4122
  QuocDL authored Jul 06, 2024
  
  fcac4122
- chore: merge branch fix/google-iframe · 40a06ad5
  QuocDL authored Jul 06, 2024
  
  40a06ad5
- fix: default value to filter · da162936
  QuocDL authored Jul 06, 2024
  
  da162936
- feat(admin): add filtering functionality to employee and order management · 7527e491
  HarmonyHieu authored Jul 06, 2024
  
  7527e491
- fix: popup details store props type · e1a917c2
  Tuan Anh authored Jul 06, 2024
  
  e1a917c2
- Merge remote-tracking branch 'origin/fix/google-iframe' into develop · b53cadaf
  Tuan Anh authored Jul 06, 2024
  
  b53cadaf
- fix: google map use iframe · 261bfa58
  QuocDL authored Jul 06, 2024
  
  261bfa58
- docs: update docs · a5ed6184
  Tuan Anh authored Jul 06, 2024
  
  a5ed6184
- Merge branch 'develop' · 94e9daaf
  Tuan Anh authored Jul 06, 2024
  
  94e9daaf
- chore: remove contributors's email · 4fcd4e9e
  Tuan Anh authored Jul 06, 2024
  
  4fcd4e9e
- chore: change style docs · 8211c9a9
  Tuan Anh authored Jul 06, 2024
  
  8211c9a9
- chore: remove contributors's email · 2959ca04
  Tuan Anh authored Jul 06, 2024
  
  2959ca04
- Merge branch 'develop' · 61750bc4
  Tuan Anh authored Jul 06, 2024
  
  61750bc4
- chore: remove contributors's email · c29642f7
  Tuan Anh authored Jul 06, 2024
  
  c29642f7
- chore: remove contributors's email · 7db66fa6
  Tuan Anh authored Jul 06, 2024
  
  7db66fa6
- docs: update document · 54756be0
  Tuan Anh authored Jul 06, 2024
  
  54756be0
- test: filter, demo 7/7/2024 · 40fb7774
  Tuan Anh authored Jul 06, 2024
  
  40fb7774
- feat(admin): add filtering functionality to employee and order management · 16a389e3
  HarmonyHieu authored Jul 06, 2024
  
  16a389e3
Jul 05, 2024
- Merge remote-tracking branch 'origin/feat/toogle-admin' into develop · f068a811
  Tuan Anh authored Jul 05, 2024
  
  f068a811
- feat: toogle lang and mode · 11ea8fb0
  QuocDL authored Jul 05, 2024
  
  11ea8fb0
- Merge remote-tracking branch 'origin/fix/disable-old-opening-day' · dddd543f
  Tuan Anh authored Jul 05, 2024
  
  dddd543f
- Merge remote-tracking branch 'origin/refactor/staff-form' · 1d3bdbac
  Tuan Anh authored Jul 05, 2024
  
  1d3bdbac
- fix(Staff schedule): disable old opening day · f042facb
  MWare CEO authored Jul 05, 2024
  
  f042facb
- chore: auto fill role staff · d545d5f7
  sweetcter authored Jul 05, 2024
  
  d545d5f7
- Merge remote-tracking branch 'origin/refactor/staff-form' into develop · 2fb1c2a5
  Tuan Anh authored Jul 05, 2024
  
  2fb1c2a5
- refactor: auto fill staff form · 8d6ac52e
  sweetcter authored Jul 05, 2024
  
  8d6ac52e
Jul 03, 2024
- Merge branch 'develop' of https://gitlab.com/imta_intern/booking-online-fe into develop · 83cee269
  QuangMphann authored Jul 03, 2024
  
  83cee269
- fix: select form of update booking status · baeb9a4c
  QuangMphann authored Jul 03, 2024
  
  baeb9a4c
- fix(Staff): 🐛 fix laguage bookings and toast service · b8a978d3
  Đào Minh authored Jul 03, 2024
  
  b8a978d3
Jul 02, 2024
- Merge remote-tracking branch 'origin/refactor/staff-form' into develop · 944ceb4b
  Tuan Anh authored Jul 02, 2024
  
  944ceb4b
- fix: invalidate category edit, hydrate field edit staff, form booking confirm require user > 12 · fc82a45b
  sweetcter authored Jul 02, 2024
  
  fc82a45b
- Merge branch 'fix/calendar' into develop · 1b4d2714
  Tuan Anh authored Jul 02, 2024
  
  1b4d2714
- Merge branch 'fix/calendar' of gitlab.com:imta_intern/booking-online-fe into fix/calendar · cdac4a11
  Tuan Anh authored Jul 02, 2024
  
  cdac4a11
- Merge remote-tracking branch 'origin/fix/calendar' into develop · 08435850
  Tuan Anh authored Jul 02, 2024
  
  08435850
- refactor: sorted role user · 4156fa15
  QuocDL authored Jul 02, 2024
  
  4156fa15
- refactor: filter old date to render special date · 16c3fce7
  QuocDL authored Jul 02, 2024
  
  16c3fce7