Commits · change-google-login-serializer · ppl-fasilkom-ui / 2021 / Kelas D / PT Gizi Sehat

30 May, 2021 8 commits
- [REFACTOR] Change google view serializer to user auth serializer · fe819d52
  Glenda Emanuella Sutanto authored May 30, 2021
  
  fe819d52
- Merge branch 'PBI-13-ProgressDietClient' into 'staging' · a7af13ae
  Muzaki Azami authored May 30, 2021
```
Pbi 13 progress diet client

See merge request !72
```
  a7af13ae
- Merge branch 'staging' into 'PBI-13-ProgressDietClient' · a024531c
  Muzaki Azami authored May 30, 2021
```
# Conflicts:
#   diet_progress/models.py
```
  a024531c
- changing client relation to weekly report to be one-to-many · dd350605
  Ami authored May 30, 2021
  
  dd350605
- Merge branch 'PBI-13-ProgressDietClient' into 'staging' · 0780e3fb
  Muzaki Azami authored May 30, 2021
```
Pbi 13 progress diet client

See merge request !71
```
  0780e3fb
- Pbi 13 progress diet client · b2e5b663
  Muzaki Azami authored May 30, 2021
  
  b2e5b663
- [GREEN] implementing weekly reports · 3e61a60b
  Ami authored May 30, 2021
  
  3e61a60b
- [RED] creating test for weekly report · 150cab90
  Ami authored May 30, 2021
  
  150cab90
29 May, 2021 5 commits
- Merge branch 'staging' of... · 764f738f
  Ami authored May 29, 2021
```
Merge branch 'staging' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2021/DD/pt-gizi-sehat-dietela/dietela-backend into PBI-13-ProgressDietClient
```
  764f738f
- Merge branch 'add-cart-id-in-user-data' into 'staging' · c0f82ea7
  Glenda Emanuella Sutanto authored May 29, 2021
```
Added cart_id in auth user serializer

See merge request !70
```
  c0f82ea7
- [REFACTOR] Added cart_id in auth user serializer · cf47627e
  Glenda Emanuella Sutanto authored May 29, 2021
  
  cf47627e
- Merge branch 'sorting-client-and-adding-search' into 'staging' · 1085a3de
  Muzaki Azami authored May 29, 2021
```
Sorting client and adding search

See merge request !69
```
  1085a3de
- Sorting client and adding search · 9d83e075
  Muzaki Azami authored May 29, 2021
  
  9d83e075
28 May, 2021 4 commits
- simplifying views · d9a9aac1
  Ami authored May 28, 2021
  
  d9a9aac1
- changing 'username' attributes to 'name' · b231b451
  Ami authored May 28, 2021
  
  b231b451
- list of clients is now sorted + adding 'search' functionality for searching clients · 1dea0ac1
  Ami authored May 28, 2021
  
  1dea0ac1
- Merge branch 'staging' of... · 4be501ca
  Ami authored May 28, 2021
```
Merge branch 'staging' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2021/DD/pt-gizi-sehat-dietela/dietela-backend into sorting-client-and-adding-search
```
  4be501ca
23 May, 2021 2 commits
- Merge branch 'improve-tests' into 'staging' · 45b294be
  Glenda Emanuella Sutanto authored May 23, 2021
```
Tests Enhancement

See merge request !68
```
  45b294be
- [REFACTOR] Enhanced tests to improve quality · 8bcfd55f
  Glenda Emanuella Sutanto authored May 23, 2021
  
  8bcfd55f
18 May, 2021 1 commit
- Update features list in README.md · 1c604c5e
  Glenda Emanuella Sutanto authored May 18, 2021
  
  1c604c5e
17 May, 2021 6 commits
- Merge branch 'add-response-in-midtrans-redirection' into 'staging' · 9e4b90aa
  Glenda Emanuella Sutanto authored May 17, 2021
```
Add response in midtrans redirection

See merge request !67
```
  9e4b90aa
- Add response in midtrans redirection · b45528d7
  Glenda Emanuella Sutanto authored May 17, 2021
  
  b45528d7
- Merge branch 'linking-customuser-nutritionist' into 'staging' · 232883df
  Muzaki Azami authored May 17, 2021
```
Linking customuser and nutritionist while linking customuser and cart

See merge request !66
```
  232883df
- Linking customuser and nutritionist while linking customuser and cart · a8da2591
  Muzaki Azami authored May 17, 2021
  
  a8da2591
- linking user with cart now also links user with nutritionist · e00addf7
  Ami authored May 17, 2021
  
  e00addf7
- Merge branch 'staging' of... · 119a2ea1
  Ami authored May 17, 2021
```
Merge branch 'staging' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2021/DD/pt-gizi-sehat-dietela/dietela-backend into linking-customuser-nutritionist
```
  119a2ea1
12 May, 2021 2 commits
- Merge branch 'fix-media-url' into 'staging' · fbb27506
  Glenda Emanuella Sutanto authored May 12, 2021
```
Add prefix for media url

See merge request !65
```
  fbb27506
- [CHORES] Add prefix for media url · 3dfd5ed4
  Glenda Emanuella Sutanto authored May 12, 2021
  
  3dfd5ed4
11 May, 2021 12 commits
- Merge branch 'user-creation-form-in-admin' into 'staging' · 9230f935
  Kefas Satrio Bangkit Solidedantyo authored May 11, 2021
```
User form in admin

See merge request !64
```
  9230f935
- User form in admin · 1530b491
  Glenda Emanuella Sutanto authored May 11, 2021 and Kefas Satrio Bangkit Solidedantyo committed May 11, 2021
  
  1530b491
- Merge branch 'PBI-12-ProfileDietkuTimDietela' into 'staging' · 2e66621b
  Muzaki Azami authored May 11, 2021
```
Pbi 12 profile dietku tim dietela

See merge request !63
```
  2e66621b
- Pbi 12 profile dietku tim dietela · e4582b5b
  Muzaki Azami authored May 11, 2021
  
  e4582b5b
- resolve latest merge conflict with staging · 12e71ce1
  Ami authored May 11, 2021
  
  12e71ce1
- Merge branch 'PBI-11-ProfileDietkuClient' into 'staging' · f53e05f6
  Glenda Emanuella Sutanto authored May 11, 2021
```
Filtered get all diet recommendation request by token

See merge request !62
```
  f53e05f6
- Filtered get all diet recommendation request by token · f0842edf
  Glenda Emanuella Sutanto authored May 11, 2021
  
  f0842edf
- resolve merge conflict between staging and PBI-12 · 2635df36
  Ami authored May 11, 2021
  
  2635df36
- resolving merge conflict between PBI-12 and other PBIs · 2ef0ec65
  Ami authored May 11, 2021
  
  2ef0ec65
- [GREEN] implementing export csv and utils · f18b2f8b
  Ami authored May 11, 2021
  
  f18b2f8b
- Merge branch 'PBI-9-ModifySerializer' into 'staging' · 7e768657
  Muzaki Azami authored May 11, 2021
```
Modify diet questionnaire serializer to display user details

See merge request !61
```
  7e768657
- Modify diet questionnaire serializer to display user details · 781e77e5
  Glenda Emanuella Sutanto authored May 11, 2021 and Muzaki Azami committed May 11, 2021
  
  781e77e5