GitLab

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

Pbi 13 progress diet client

See merge request !77

adding sugary_ingredients field on weekly report model + adding API to GET a specific user's weekly reports

Pbi 13 progress diet client

See merge request !76

adding sugary_ingredients field on weekly report model + adding API to GET a specific user's weekly reports

adding sugary_ingredients field on weekly report model + adding API to GET a specific user's weekly reports

Add program end date field in cart

See merge request !75

Progress Diet Nutritionist

See merge request !74

Change google view serializer with user auth serializer

See merge request !73

Pbi 13 progress diet client

See merge request !72

# Conflicts:
#   diet_progress/models.py

Pbi 13 progress diet client

See merge request !71

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

Added cart_id in auth user serializer

See merge request !70

Sorting client and adding search

See merge request !69

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

Tests Enhancement

See merge request !68

Add response in midtrans redirection

See merge request !67

Linking customuser and nutritionist while linking customuser and cart

See merge request !66