Commits · 1646ea888d22de01451afe09d1532e97456e394d · ppl-fasilkom-ui / PPL Sosial / pilar / pilar-backend

24 Nov, 2020 3 commits
- fixing · 1646ea88
  inez nabila authored Nov 24, 2020
  
  1646ea88
- fixing · 21fa9386
  inez nabila authored Nov 24, 2020
  
  21fa9386
- changed the fields in serializers · 9fa68ac2
  inez nabila authored Nov 24, 2020
  
  9fa68ac2
22 Nov, 2020 6 commits
- Merge branch 'pbi8' into 'staging' · 168482af
  Rayhan Muzakki authored Nov 22, 2020
```
Pbi8

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!90
```
  168482af
- [CHORES] fixed profit from modal-price to price-modal · be946c90
  rayhan muzakki authored Nov 22, 2020
  
  be946c90
- Merge branch 'pbi8' into 'staging' · 16cde302
  Rayhan Muzakki authored Nov 22, 2020
```
Pbi8

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!89
```
  16cde302
- [REFACTOR] added total_profit to product model and added the code so that... · e8696043
  Rayhan Muzakki authored Nov 22, 2020
```
[REFACTOR] added total_profit to product model and added the code so that increments per products bought
```
  e8696043
- [CHORES] fix merging of modal default · 894dfba7
  rayhan muzakki authored Nov 22, 2020
  
  894dfba7
- [CHORES] added default to modal · c8471c86
  rayhan muzakki authored Nov 22, 2020
  
  c8471c86
21 Nov, 2020 10 commits
- Merge branch 'pbi8' into 'staging' · 3ef180b7
  Rayhan Muzakki authored Nov 21, 2020
```
Pbi8

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!88
```
  3ef180b7
- [REFACTOR] added total_profit to product model and added the code so that... · 722eb26a
  Rayhan Muzakki authored Nov 21, 2020
```
[REFACTOR] added total_profit to product model and added the code so that increments per products bought
```
  722eb26a
- [REFACTOR] added total_profit to product model and added the code so that... · e229710a
  rayhan muzakki authored Nov 21, 2020
```
[REFACTOR] added total_profit to product model and added the code so that increments per products bought
```
  e229710a
- [CHORES] fix merge conflicts · 14b6b136
  rayhan muzakki authored Nov 21, 2020
  
  14b6b136
- [CHORES] merge makemigrations · fa74c58b
  rayhan muzakki authored Nov 21, 2020
  
  fa74c58b
- [REFACTOR] fixed merge conflicts · 86c37850
  rayhan muzakki authored Nov 21, 2020
  
  86c37850
- [REFACTOR] added modal and profit to product model, fixed create_product_test · 1226d91c
  rayhan muzakki authored Nov 21, 2020
  
  1226d91c
- [REFACTOR] added modal and profit to product model, fixed create_product_test · 5f2cbacf
  rayhan muzakki authored Nov 21, 2020
  
  5f2cbacf
- Merge branch 'staging' into 'pbi8' · 59afe840
  Rayhan Muzakki authored Nov 21, 2020
```
# Conflicts:
#   api/tests.py
#   api/views.py
```
  59afe840
- [REFACTOR] added modal and profit to product model, fixed create_product_test · 32ee9514
  rayhan muzakki authored Nov 21, 2020
  
  32ee9514
19 Nov, 2020 6 commits
- [REFACTOR] changed date into today · b4354c9c
  rayhan muzakki authored Nov 19, 2020
  
  b4354c9c
- Merge branch 'pbi9' into 'staging' · 211596d7
  inez nabila authored Nov 19, 2020
```
pengguna loyal pbi9

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!87
```
  211596d7
- lint fix 3 · 06621412
  inez nabila authored Nov 19, 2020
  
  06621412
- lint fix 2 · c66d959b
  inez nabila authored Nov 19, 2020
  
  c66d959b
- fixed lint 1 · 6cfb4e61
  inez nabila authored Nov 19, 2020
  
  6cfb4e61
- refactor views and models · 2227cf4d
  inez nabila authored Nov 19, 2020
  
  2227cf4d
10 Nov, 2020 6 commits
- Merge branch 'pbi3' into 'staging' · 17ab7085
  Rayhan Muzakki authored Nov 10, 2020
```
Pbi5

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!86
```
  17ab7085
- Pbi5 · 17a8d901
  Rayhan Muzakki authored Nov 10, 2020
  
  17a8d901
- Merge branch 'pbi3' into 'staging' · 46c7e5b2
  Rayhan Muzakki authored Nov 10, 2020
```
Pbi5

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!85
```
  46c7e5b2
- Pbi5 · c0fade36
  Rayhan Muzakki authored Nov 10, 2020
  
  c0fade36
- Merge branch 'pbi3' into 'staging' · 18d59dc4
  Rayhan Muzakki authored Nov 10, 2020
```
Pbi 5

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!84
```
  18d59dc4
- Pbi 5 · 3c9ec9c4
  Rayhan Muzakki authored Nov 10, 2020
  
  3c9ec9c4
29 Oct, 2020 7 commits
- Merge branch 'pbi3' into 'staging' · 10f616e6
  Rayhan Muzakki authored Oct 29, 2020
```
Pbi5

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!83
```
  10f616e6
- Pbi5 · 4969e7aa
  Rayhan Muzakki authored Oct 29, 2020
  
  4969e7aa
- [CHORES] added filter for excel · 06822224
  rayhan muzakki authored Oct 29, 2020
  
  06822224
- Merge branch 'pbi3' into 'staging' · 786183aa
  Rayhan Muzakki authored Oct 29, 2020
```
Pbi4

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!82
```
  786183aa
- Pbi4 · 0752e711
  Rayhan Muzakki authored Oct 29, 2020
  
  0752e711
- Merge branch 'pbi3' into 'staging' · 75051af3
  Rayhan Muzakki authored Oct 29, 2020
```
Pbi4&5

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!79
```
  75051af3
- Pbi4&5 · 05b236eb
  Rayhan Muzakki authored Oct 29, 2020
  
  05b236eb
28 Oct, 2020 1 commit
- [REFACTOR] tweaked test for donation goods · 042c55fd
  rayhan muzakki authored Oct 28, 2020
  
  042c55fd
26 Oct, 2020 1 commit
- Merge branch 'pbi67' into 'staging' · ba44fea4
  Rayhan Muzakki authored Oct 26, 2020
```
Pbi67

See merge request ppl-fasilkom-ui/itproject-2020/group-b/pilar-backend!78
```
  ba44fea4