Commits · AFP-12 · Ascend / inventory-promotion-react

10 May, 2021 24 commits
- [AFP-12] Fix issue with search on searchResults page · d44bc804
  Khai Yuan Liew authored May 10, 2021
  
  d44bc804
- [AFP-12] Fix merge conflict with dev · 565f3c48
  Khai Yuan Liew authored May 10, 2021
  
  565f3c48
- [AFP-12] Finish work on search item functionality · 2628a19b
  Khai Yuan Liew authored May 10, 2021
  
  2628a19b
- Merge branch 'revert-56bf62ee' into 'dev' · 8279f394
  John Lam authored May 10, 2021
```
Revert "fix merge conflicts for promo list"

See merge request !9
```
  8279f394
- Revert "fix merge conflicts for promo list" · 8caf1066
  John Lam authored May 10, 2021
```
This reverts merge request !8
```
  8caf1066
- fix merge conflicts for promo list · 56bf62ee
  John Lam authored May 10, 2021
  
  56bf62ee
- fixed some merge conflicts and errors on my part · fecdf38d
  John Lam authored May 10, 2021
  
  fecdf38d
- fix merge conflict · 4d719d79
  John Lam authored May 10, 2021
  
  4d719d79
- Merge branch 'AFP-14' into 'dev' · 68d3275f
  John Lam authored May 10, 2021
```
Afp 14: update product form (frontend)

See merge request !7
```
  68d3275f
- Merge branch 'dev' into 'AFP-14' · 126ba0b9
  John Lam authored May 10, 2021
```
# Conflicts:
#   src/component/Main.jsx
#   src/component/ProductForm.jsx
```
  126ba0b9
- add update promo, list, and delete · 744924f5
  John Lam authored May 10, 2021
  
  744924f5
- [AFP-12] Got search by name working · b27449cb
  Khai Yuan Liew authored May 10, 2021
  
  b27449cb
- Centered product grid on /products · 775cec94
  Ben Anderson authored May 10, 2021
  
  775cec94
- Added link to new product form in products page header · 704e3419
  Ben Anderson authored May 10, 2021
  
  704e3419
- [AFP-12] Fix merge conflict · 89b7e0ed
  Khai Yuan Liew authored May 10, 2021
  
  89b7e0ed
- [AFP-12] Work on Search Component · aedec205
  Khai Yuan Liew authored May 10, 2021
  
  aedec205
- Fixed routing and data fetching · af70a1fa
  Ben Anderson authored May 10, 2021
  
  af70a1fa
- promotions list, add, delete buttons · bd397691
  John Lam authored May 10, 2021
  
  bd397691
- Merge branch 'AFP-11' into dev · a6fee5bc
  Ben Anderson authored May 10, 2021
  
  a6fee5bc
- Removed duplocate close button · 59209607
  Ben Anderson authored May 10, 2021
  
  59209607
- Resolved merge conflixt AFP-8 · 2971e4f7
  Ben Anderson authored May 10, 2021
  
  2971e4f7
- Resolved merge conflixt AFP-8 · 5122da5b
  Ben Anderson authored May 10, 2021
  
  5122da5b
- Fixes button spacing · 07064059
  Sumaiyya Burney authored May 10, 2021
  
  07064059
- merge new promos · 9068a7f1
  John Lam authored May 10, 2021
  
  9068a7f1
09 May, 2021 1 commit
- Adds product pop up · ccf9925a
  Sumaiyya Burney authored May 10, 2021
  
  ccf9925a
07 May, 2021 15 commits
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into AFP-12 · 33c9bdb2
  Khai Yuan Liew authored May 07, 2021
```
Merged with dev
```
  33c9bdb2
- [AFP-12] Start Search Functionality · 103c947b
  Khai Yuan Liew authored May 07, 2021
  
  103c947b
- Merge branch 'AFP-8-new-promotion-form' into dev · 82a1f9f9
  John Lam authored May 07, 2021
  
  82a1f9f9
- Merge branch 'AFP-7' into 'dev' · cb411b58
  John Lam authored May 07, 2021
```
Afp 7

See merge request !1
```
  cb411b58
- Added Docker and nginx config · 3c7004ab
  Ben Anderson authored May 07, 2021
  
  3c7004ab
- Added edit functionality to product form · fcd0852e
  Ben Anderson authored May 07, 2021
  
  fcd0852e
- spacing · b6968929
  John Lam authored May 07, 2021
  
  b6968929
- add css, error validation to promotion form · e9dc5693
  John Lam authored May 07, 2021
  
  e9dc5693
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into dev · 89f107b4
  Khai Yuan Liew authored May 07, 2021
```
Need to merge
```
  89f107b4
- Merge branch 'AFP-10' into dev · 6c54474a
  Ben Anderson authored May 07, 2021
  
  6c54474a
- Added Heading to products page · b125e520
  Ben Anderson authored May 07, 2021
  
  b125e520
- Fixes dependencies · e269419a
  Sumaiyya Burney authored May 07, 2021
  
  e269419a
- Tweaked product form fields · d6f57876
  Ben Anderson authored May 07, 2021
  
  d6f57876
- Moves CSS into appropriate folder · 14c80682
  Sumaiyya Burney authored May 07, 2021
  
  14c80682
- Added component to fetch product details, refactored image options · 6dd744aa
  Ben Anderson authored May 07, 2021
  
  6dd744aa