Commits · dev · Ascend / inventory-promotion-react

17 May, 2021 1 commit
- merge conflict with master · 19d97ad5
  John Lam authored May 17, 2021
  
  19d97ad5
14 May, 2021 1 commit
- Updated routing · b15d2820
  Ben Anderson authored May 14, 2021
  
  b15d2820
13 May, 2021 24 commits
- Centers title (better!) and cleans dropdown CSS · d4bee319
  Sumaiyya Burney authored May 14, 2021
  
  d4bee319
- Fixes routing · 98c380e9
  Sumaiyya Burney authored May 14, 2021
  
  98c380e9
- Merge branch 'uniform-styling' into 'dev' · 7fde570f
  Julius Wu authored May 14, 2021
```
Uniform styling

See merge request !22
```
  7fde570f
- Fixes logout dropdown errors · b992e512
  Sumaiyya Burney authored May 14, 2021
  
  b992e512
- integration demo · 0237d01e
  Christopher Cottier authored May 14, 2021
  
  0237d01e
- Swaps Ascend text for Nisum logo · a5eb703a
  Sumaiyya Burney authored May 13, 2021
  
  a5eb703a
- Merge branch 'uniform-styling' of... · ba219fde
  Julius Wu authored May 13, 2021
```
Merge branch 'uniform-styling' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into uniform-styling
```
  ba219fde
- profile dropdown · 4fad1209
  Julius Wu authored May 13, 2021
  
  4fad1209
- Merge branch 'uniform-styling' of... · 4df0ef07
  Sumaiyya Burney authored May 13, 2021
```
Merge branch 'uniform-styling' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into uniform-styling
```
  4df0ef07
- Merge branch 'dev' into 'uniform-styling' · 0bf58a8b
  Sumaiyya Burney authored May 13, 2021
```
Dev

See merge request !21
```
  0bf58a8b
- Centers page title with CSS · b801a08d
  Sumaiyya Burney authored May 13, 2021
  
  b801a08d
- Merge branch 'AFP-110-list-promotions' into 'dev' · b33ae44d
  Khai Yuan Liew authored May 13, 2021
```
Afp 110 list promotions

See merge request !20
```
  b33ae44d
- fix stylings / routes · 1d0f1b82
  John Lam authored May 13, 2021
  
  1d0f1b82
- Merge branch 'dev' into AFP-110-list-promotions · 08bd5ed9
  John Lam authored May 13, 2021
  
  08bd5ed9
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/inventory-promotion-react into dev · c34c1e1d
  John Lam authored May 13, 2021
  
  c34c1e1d
- Merge branch 'dev' into 'uniform-styling' · 797dcf3e
  Sumaiyya Burney authored May 13, 2021
```
Merge branch 'uniform-styling' into 'dev'

See merge request !19
```
  797dcf3e
- fix to update forms and styles · d281331f
  John Lam authored May 13, 2021
  
  d281331f
- Merge branch 'uniform-styling' into 'dev' · d3eae5cd
  Sumaiyya Burney authored May 13, 2021
```
CSS changes to align with other teams

See merge request !18
```
  d3eae5cd
- 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
- merge with AFP-110 dev and fix conflicts · 0b732f3a
  John Lam authored May 13, 2021
  
  0b732f3a
- fix pull · 694b3040
  John Lam authored May 13, 2021
  
  694b3040
12 May, 2021 11 commits
- remove semantic ui dependency, use npm instead · 0ad17a5b
  John Lam authored May 12, 2021
  
  0ad17a5b
- 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 3 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
- cleaned up update form and promo list · 0ee4f191
  John Lam authored May 11, 2021
  
  0ee4f191