Commits · 83cf15541307afce8255d44273e2a86f92643943 · Ascend / inventory-promotion-react

13 May, 2021 4 commits
- Merge branch 'dev' into 'uniform-styling' · 83cf1554
  Sumaiyya Burney authored May 13, 2021
```
# Conflicts:
#   src/component/Header.jsx
```
  83cf1554
- Merge branch 'AFP-6-frontend' into 'dev' · 859e35a3
  Sumaiyya Burney authored May 13, 2021
```
AFP-6 frontend auth

See merge request !17
```
  859e35a3
- CSS changes to align with other teams · 973bbdfe
  Sumaiyya Burney authored May 13, 2021
  
  973bbdfe
- frontend auth · 627e81b8
  Julius Wu authored May 13, 2021
  
  627e81b8
12 May, 2021 10 commits
- Merge branch 'AFP-15' into dev · bf59eb91
  Ben Anderson authored May 12, 2021
  
  bf59eb91
- Merge branch 'AFP-141' into 'dev' · b3fda0f1
  Khai Yuan Liew authored May 12, 2021
```
Afp 141

See merge request !15
```
  b3fda0f1
- Removed dropdown label · 7436c8a5
  Ben Anderson authored May 12, 2021
  
  7436c8a5
- Create select field to filter products · c2c68656
  Ben Anderson authored May 12, 2021
  
  c2c68656
- [AFP-15] Fix crash upon deleting item in search results page · ec28b423
  Khai Yuan Liew authored May 12, 2021
  
  ec28b423
- Merge branch 'AFP-10' into dev · 7d32de39
  Ben Anderson authored May 12, 2021
  
  7d32de39
- Added upc to products table · 89697267
  Ben Anderson authored May 12, 2021
  
  89697267
- Cleans product form fields just a little bit more · e49d9acc
  Sumaiyya Burney authored May 12, 2021
  
  e49d9acc
- Updates field name in product form · a5af0657
  Sumaiyya Burney authored May 12, 2021
  
  a5af0657
- Fixes search results, delete from search is broken · 7ed7c153
  Sumaiyya Burney authored May 12, 2021
  
  7ed7c153
11 May, 2021 7 commits
- Changes inventory to table from grid · a207c9dd
  Sumaiyya Burney authored May 12, 2021
  
  a207c9dd
- Merge branch 'dev' into 'AFP-10' · 17c39e14
  Sumaiyya Burney authored May 11, 2021
```
Merge Dev int AFP-10

See merge request !13
```
  17c39e14
- add imports · b5efca59
  John Lam authored May 11, 2021
  
  b5efca59
- Resolved Merge conflicts AFp-110 · f8f20561
  Ben Anderson authored May 11, 2021
  
  f8f20561
- Merged AFP-15 · b1d492ce
  Ben Anderson authored May 11, 2021
  
  b1d492ce
- [AFP-15] Fix merge conflict · 734ea5af
  Khai Yuan Liew authored May 11, 2021
  
  734ea5af
- [AFP-15] Finish work on delete product functionality · c527f1b9
  Khai Yuan Liew authored May 11, 2021
  
  c527f1b9
10 May, 2021 19 commits
- fix to add form default value and fix bug · 9c2fe6a4
  John Lam authored May 11, 2021
  
  9c2fe6a4
- add css · aa7638e5
  John Lam authored May 11, 2021
  
  aa7638e5
- added dropdown menu in promotion forms for products · 4bc5e7af
  John Lam authored May 11, 2021
  
  4bc5e7af
- add semantic ui · 8824a0d3
  John Lam authored May 10, 2021
  
  8824a0d3
- Merge branch 'AFP-12' into 'dev' · aeeffe76
  John Lam authored May 10, 2021
```
AFP-12: User can search for an item by name or sku

See merge request !11
```
  aeeffe76
- [AFP-12] Fix issue with search on searchResults page · d44bc804
  Khai Yuan Liew authored May 10, 2021
  
  d44bc804
- [AFP-15] Start work on Delete product functionality · 227fb9ee
  Khai Yuan Liew authored May 10, 2021
  
  227fb9ee
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into AFP-15 · 7803e712
  Khai Yuan Liew authored May 10, 2021
```
Need to update AFP-15 repo
```
  7803e712
- [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