Code

mvp#69

Code

Merged

ragimov700 merged 163 commits intomainTenth-Team/backend:mainfrom developTenth-Team/backend:developCopy head branch name to clipboardMar 10, 2024

+5,457-62

Commits

Commits on Feb 23, 2024

• add registration and authentication

  qwertttyyy

  committed
  325186d

  Copy full SHA for 325186d

• Added docker compose local version

  antonata-c

  committed
  07523e3

  Copy full SHA for 07523e3

• Added backend dockerfile and env handling

  antonata-c

  committed
  451f943

  Copy full SHA for 451f943

• Revert "Added backend dockerfile and env handling"

  Show description for 34a09a6
  antonata-c

  committed
  34a09a6

  Copy full SHA for 34a09a6

• Revert "Revert "Added backend dockerfile and env handling""

  Show description for 2fa506d
  antonata-c

  committed
  2fa506d

  Copy full SHA for 2fa506d

• Added static gitignore

  antonata-c

  committed
  5e3c526

  Copy full SHA for 5e3c526

• Reworked gunicorn to default server startup

  antonata-c

  committed
  055a1bd

  Copy full SHA for 055a1bd

• made edits

  qwertttyyy

  committed
  f489864

  Copy full SHA for f489864

• added ambassadors app and models

  ragimov700

  committed
  3b991d4

  Copy full SHA for 3b991d4

• Merge pull request #7 from Tenth-Team/local_docker

  Show description for 7245d90
  ragimov700

  authored
  7245d90

  Copy full SHA for 7245d90

• Merge branch 'develop' into feature/users

  ragimov700

  authored
  d8891c8

  Copy full SHA for d8891c8

• Merge pull request #6 from Tenth-Team/feature/users

  Show description for 43fa2d4
  ragimov700

  authored
  43fa2d4

  Copy full SHA for 43fa2d4

• Merge branch 'develop' into ambassadors

  ragimov700

  authored
  b6733f3

  Copy full SHA for b6733f3

• Merge pull request #8 from Tenth-Team/ambassadors

  Show description for 69b0cc2
  ragimov700

  authored
  69b0cc2

  Copy full SHA for 69b0cc2

Commits on Feb 24, 2024

• base api config

  ragimov700

  committed
  0620fa2

  Copy full SHA for 0620fa2

• Merge pull request #9 from Tenth-Team/api

  Show description for 7e15ab9
  ragimov700

  authored
  7e15ab9

  Copy full SHA for 7e15ab9

• CI

  VadimGurzhy

  committed
  8340933

  Copy full SHA for 8340933

• ambassador viewset and serializer

  ragimov700

  committed
  2a690b6

  Copy full SHA for 2a690b6

• Merge pull request #10 from Tenth-Team/CI

  Show description for 6809dfb
  ragimov700

  authored
  6809dfb

  Copy full SHA for 6809dfb

• Merge pull request #14 from Tenth-Team/api-amb

  Show description for 27e6339
  ragimov700

  authored
  27e6339

  Copy full SHA for 27e6339

Commits on Feb 25, 2024

• Added static_root and daphne

  antonata-c

  committed
  96416b9

  Copy full SHA for 96416b9

• Added docker-compose for production

  antonata-c

  committed
  a2bc11f

  Copy full SHA for a2bc11f

• Fixed backend compose command

  antonata-c

  committed
  87acce2

  Copy full SHA for 87acce2

Commits on Feb 26, 2024

• Merge pull request #15 from Tenth-Team/docker_prod

  Show description for 3053170
  ragimov700

  authored
  3053170

  Copy full SHA for 3053170

• added Content model

  qwertttyyy

  committed
  eaed660

  Copy full SHA for eaed660

Commits on Feb 27, 2024

• integration with yandex forms

  ragimov700

  committed
  53c6c53

  Copy full SHA for 53c6c53

• Merge pull request #17 from Tenth-Team/api-amb

  Show description for 7c0f413
  ragimov700

  authored
  7c0f413

  Copy full SHA for 7c0f413

• added csrf setting

  ragimov700

  committed
  27f972b

  Copy full SHA for 27f972b

• models settings

  ragimov700

  committed
  0186be1

  Copy full SHA for 0186be1

• config admin for ambassadors

  ragimov700

  committed
  10b2797

  Copy full SHA for 10b2797

• Merge pull request #18 from Tenth-Team/settings

  Show description for 1657afd
  ragimov700

  authored
  1657afd

  Copy full SHA for 1657afd

• fix github workflow

  ragimov700

  committed
  768619f

  Copy full SHA for 768619f

• fix github workflow

  ragimov700

  committed
  8696e8b

  Copy full SHA for 8696e8b

• fix github workflow

  ragimov700

  committed
  50c8001

  Copy full SHA for 50c8001

• fix github workflow

  ragimov700

  committed
  4098e1c

  Copy full SHA for 4098e1c

• flake8 fix

  ragimov700

  committed
  3d10ec9

  Copy full SHA for 3d10ec9

• imports fix

  ragimov700

  committed
  2f87fb3

  Copy full SHA for 2f87fb3

• Merge pull request #20 from Tenth-Team/settings

  Show description for 33d3744
  ragimov700

  authored
  33d3744

  Copy full SHA for 33d3744

Commits on Feb 28, 2024

• Delete migration

  qwertttyyy

  authored
  e1191cc

  Copy full SHA for e1191cc

• Merge branch 'develop' into feature/content

  qwertttyyy

  authored
  514c744

  Copy full SHA for 514c744

• Update admin.py

  qwertttyyy

  authored
  f125111

  Copy full SHA for f125111

• fix imports

  qwertttyyy

  authored
  7a3dcb6

  Copy full SHA for 7a3dcb6

• fix imports

  qwertttyyy

  authored
  8fd4abd

  Copy full SHA for 8fd4abd

• fix imports

  qwertttyyy

  committed
  95c14c2

  Copy full SHA for 95c14c2

• fix imports

  qwertttyyy

  committed
  359dcbb

  Copy full SHA for 359dcbb

• fix Meta and str

  qwertttyyy

  committed
  95955da

  Copy full SHA for 95955da

• fix Meta and str

  qwertttyyy

  committed
  83885f3

  Copy full SHA for 83885f3

Commits on Feb 29, 2024

• Merge pull request #16 from Tenth-Team/feature/content

  Show description for 5b4f008
  ragimov700

  authored
  5b4f008

  Copy full SHA for 5b4f008

• telegram username format

  ragimov700

  committed
  52ca22e

  Copy full SHA for 52ca22e

• fix flake8

  ragimov700

  committed
  db8074b

  Copy full SHA for db8074b

• fix isort

  ragimov700

  committed
  8f0edc2

  Copy full SHA for 8f0edc2

• Merge pull request #22 from Tenth-Team/amb

  Show description for dd5d6a1
  ragimov700

  authored
  dd5d6a1

  Copy full SHA for dd5d6a1

• added content create option

  qwertttyyy

  committed
  1609f93

  Copy full SHA for 1609f93

• added telegram field validation

  qwertttyyy

  committed
  b3dde65

  Copy full SHA for b3dde65

• added content filtering

  qwertttyyy

  committed
  6c3e5e1

  Copy full SHA for 6c3e5e1

• added docs

  qwertttyyy

  committed
  e2fdbc1

  Copy full SHA for e2fdbc1

• added docs

  qwertttyyy

  committed
  6f4d95f

  Copy full SHA for 6f4d95f

Commits on Mar 1, 2024

• Модели мерча и заявки на отправку

  VadimGurzhy

  committed
  e0029f3

  Copy full SHA for e0029f3

• поправил импорты по pep8

  VadimGurzhy

  committed
  c1f175f

  Copy full SHA for c1f175f

• fix isort2

  VadimGurzhy

  committed
  7c1c73a

  Copy full SHA for 7c1c73a

• added docs

  qwertttyyy

  committed
  da3dbfa

  Copy full SHA for da3dbfa

• pep fix

  qwertttyyy

  committed
  d2404a5

  Copy full SHA for d2404a5

Commits on Mar 2, 2024

• serializers for ambassador

  ragimov700

  committed
  555d462

  Copy full SHA for 555d462

• Merge pull request #23 from Tenth-Team/model_merch

  Show description for 11aa5b0
  ragimov700

  authored
  11aa5b0

  Copy full SHA for 11aa5b0

• Merge branch 'develop' into feature/content_integration

  ragimov700

  authored
  cc0d432

  Copy full SHA for cc0d432

• Merge pull request #24 from Tenth-Team/feature/content_integration

  Show description for 9ee3f56
  ragimov700

  authored
  9ee3f56

  Copy full SHA for 9ee3f56

• Merge branch 'develop' into docs

  ragimov700

  authored
  58a1d51

  Copy full SHA for 58a1d51

• Merge branch 'develop' into amb

  ragimov700

  authored
  2cc559e

  Copy full SHA for 2cc559e

• fix requierements

  ragimov700

  committed
  7802a31

  Copy full SHA for 7802a31

• fix imports

  ragimov700

  committed
  eeebc55

  Copy full SHA for eeebc55

• fix imports

  ragimov700

  committed
  28d81ee

  Copy full SHA for 28d81ee

• Merge pull request #27 from Tenth-Team/amb

  Show description for 99f2efe
  ragimov700

  authored
  99f2efe

  Copy full SHA for 99f2efe

• Merge branch 'develop' into docs

  ragimov700

  authored
  a2e5818

  Copy full SHA for a2e5818

• Merge pull request #26 from Tenth-Team/docs

  Show description for 28da320
  ragimov700

  authored
  28da320

  Copy full SHA for 28da320

• fix merch

  ragimov700

  committed
  7d6e845

  Copy full SHA for 7d6e845

• Merge pull request #28 from Tenth-Team/amb

  Show description for cb22204
  ragimov700

  authored
  cb22204

  Copy full SHA for cb22204

• fix parsing amb_goals

  ragimov700

  committed
  fc27206

  Copy full SHA for fc27206

• Added promocode model, viewset, serializer, signal

  antonata-c

  committed
  b9ac717

  Copy full SHA for b9ac717

• Flake8

  antonata-c

  committed
  0cefdd2

  Copy full SHA for 0cefdd2

• Merge pull request #30 from Tenth-Team/promocodes

  Show description for e65e0fc
  ragimov700

  authored
  e65e0fc

  Copy full SHA for e65e0fc

• Merge pull request #29 from Tenth-Team/amb

  Show description for 5300704
  ragimov700

  authored
  5300704

  Copy full SHA for 5300704

Commits on Mar 3, 2024

• added docs for content

  qwertttyyy

  committed
  b4dcb67

  Copy full SHA for b4dcb67

• Merge branch 'develop' into docs/content

  ragimov700

  authored
  b8c88d3

  Copy full SHA for b8c88d3

• Merge pull request #31 from Tenth-Team/docs/content

  Show description for 292765b
  ragimov700

  authored
  292765b

  Copy full SHA for 292765b

• minor fixes

  ragimov700

  committed
  f765250

  Copy full SHA for f765250

• permissions for yandex forms and fixes

  ragimov700

  committed
  cac8792

  Copy full SHA for cac8792

• fix imports

  ragimov700

  committed
  40dc2bf

  Copy full SHA for 40dc2bf

• Merge pull request #33 from Tenth-Team/amb

  Show description for c6ae54f
  ragimov700

  authored
  c6ae54f

  Copy full SHA for c6ae54f

• рабочий ендпоинт на заявку

  VadimGurzhy

  committed
  2cd8019

  Copy full SHA for 2cd8019

• schema вынесена в отдельный файл, добавлен пермишен isAuthenticated

  VadimGurzhy

  committed
  fe51430

  Copy full SHA for fe51430

• Added promo_code short_serializer

  antonata-c

  committed
  743937a

  Copy full SHA for 743937a

• Fixed showing inactive promo_code

  antonata-c

  committed
  49e33f6

  Copy full SHA for 49e33f6

Commits on Mar 4, 2024

• ambassador pagination

  ragimov700

  committed
  0b3891a

  Copy full SHA for 0b3891a

• ambassador filters

  ragimov700

  committed
  db65c05

  Copy full SHA for db65c05

• reworked the filtering

  qwertttyyy

  committed
  0ec951c

  Copy full SHA for 0ec951c

• filters

  ragimov700

  committed
  a44b6bf

  Copy full SHA for a44b6bf

• fix linter

  ragimov700

  committed
  20dcd11

  Copy full SHA for 20dcd11

• Merge pull request #37 from Tenth-Team/amb

  Show description for ddb09f1
  ragimov700

  authored
  ddb09f1

  Copy full SHA for ddb09f1

Commits on Mar 5, 2024

• cors config

  ragimov700

  committed
  602528f

  Copy full SHA for 602528f

• Merge pull request #38 from Tenth-Team/cors

  Show description for 9df9da0
  ragimov700

  authored
  9df9da0

  Copy full SHA for 9df9da0

• create amb serializer

  ragimov700

  committed
  c377f73

  Copy full SHA for c377f73

• content count, and fix content model

  ragimov700

  committed
  085a0b1

  Copy full SHA for 085a0b1

• fix

  ragimov700

  committed
  ccc3776

  Copy full SHA for ccc3776

• Merge pull request #39 from Tenth-Team/tests

  Show description for 025d625
  ragimov700

  authored
  025d625

  Copy full SHA for 025d625

• Merge pull request #35 from Tenth-Team/promocodes

  Show description for 23d6702
  ragimov700

  authored
  23d6702

  Copy full SHA for 23d6702

• Merge branch 'develop' into Endpoint_MerchandiseRequest

  ragimov700

  authored
  c769408

  Copy full SHA for c769408

Commits on Mar 6, 2024

• Merge pull request #34 from Tenth-Team/Endpoint_MerchandiseRequest

  Show description for 2493fd8
  ragimov700

  authored
  2493fd8

  Copy full SHA for 2493fd8

• fix migrations

  ragimov700

  committed
  57c8e3d

  Copy full SHA for 57c8e3d

• added dumpdata

  ragimov700

  committed
  883f5a0

  Copy full SHA for 883f5a0

• Merge pull request #43 from Tenth-Team/dumpdata

  Show description for 2e84de7
  ragimov700

  authored
  2e84de7

  Copy full SHA for 2e84de7

• fixes

  ragimov700

  committed
  85b50c4

  Copy full SHA for 85b50c4

• Merge pull request #44 from Tenth-Team/fixes

  Show description for 5e7ec8e
  ragimov700

  authored
  5e7ec8e

  Copy full SHA for 5e7ec8e

• added loyalty get method

  qwertttyyy

  committed
  7b59bde

  Copy full SHA for 7b59bde

• added docstrings

  qwertttyyy

  committed
  a6dbdbe

  Copy full SHA for a6dbdbe

• Merge branch 'develop' into feature/loyalty

  qwertttyyy

  authored
  44d1b5e

  Copy full SHA for 44d1b5e

• Pre-commit with working documentation

  antonata-c

  committed
  f5ad991

  Copy full SHA for f5ad991

• fix conflicts

  qwertttyyy

  committed
  3eac2df

  Copy full SHA for 3eac2df

Commits on Mar 7, 2024

• views for training programs and goals

  ragimov700

  committed
  95035f4

  Copy full SHA for 95035f4

• factories and tests for ambassadors

  ragimov700

  committed
  7cee17a

  Copy full SHA for 7cee17a

• tests for utils

  ragimov700

  committed
  13f1ceb

  Copy full SHA for 13f1ceb

• fix flake8

  ragimov700

  committed
  174e07e

  Copy full SHA for 174e07e

• Merge pull request #47 from Tenth-Team/amb

  Show description for f382e21
  ragimov700

  authored
  f382e21

  Copy full SHA for f382e21

• fix requierements and config ci for django tests

  ragimov700

  committed
  69eee1e

  Copy full SHA for 69eee1e

• Merge pull request #48 from Tenth-Team/amb

  Show description for 3e7ecc0
  ragimov700

  authored
  3e7ecc0

  Copy full SHA for 3e7ecc0

• Merge branch 'develop' into feature/loyalty

  ragimov700

  authored
  6818ad0

  Copy full SHA for 6818ad0

• fix flake8

  ragimov700

  committed
  e2c7e44

  Copy full SHA for e2c7e44

• fix flake8

  ragimov700

  committed
  b8946cd

  Copy full SHA for b8946cd

• fix admin conflict

  ragimov700

  committed
  4d1ce28

  Copy full SHA for 4d1ce28

• Merge pull request #45 from Tenth-Team/feature/loyalty

  Show description for 6904a5c
  ragimov700

  authored
  6904a5c

  Copy full SHA for 6904a5c

• fix serializer and filters

  ragimov700

  committed
  e1d86b6

  Copy full SHA for e1d86b6

• fix

  ragimov700

  committed
  7c2f027

  Copy full SHA for 7c2f027

• Merge pull request #49 from Tenth-Team/amb

  Show description for 13bb097
  ragimov700

  authored
  13bb097

  Copy full SHA for 13bb097

• Improved OpenAPI docs

  antonata-c

  committed
  ddfe3ad

  Copy full SHA for ddfe3ad

Commits on Mar 8, 2024

• queries optimized

  ragimov700

  committed
  9f92176

  Copy full SHA for 9f92176

• Merge pull request #54 from Tenth-Team/optimization

  Show description for 4788ce7
  ragimov700

  authored
  4788ce7

  Copy full SHA for 4788ce7

• added content tests

  qwertttyyy

  committed
  8aed216

  Copy full SHA for 8aed216

• fix imports

  qwertttyyy

  committed
  dc8d0e2

  Copy full SHA for dc8d0e2

• Merge commit

  antonata-c

  committed
  e2a08e9

  Copy full SHA for e2a08e9

• fixes for lint

  antonata-c

  committed
  67b7204

  Copy full SHA for 67b7204

• Add promocode tests

  antonata-c

  committed
  ab32fbd

  Copy full SHA for ab32fbd

Commits on Mar 9, 2024

• Merge pull request #58 from Tenth-Team/tests/promocode

  Show description for a3cc81d
  ragimov700

  authored
  a3cc81d

  Copy full SHA for a3cc81d

• Merge branch 'develop' into tests/content

  ragimov700

  authored
  b200f1a

  Copy full SHA for b200f1a

• Merge pull request #55 from Tenth-Team/tests/content

  Show description for dc57951
  ragimov700

  authored
  dc57951

  Copy full SHA for dc57951

• Merge pull request #51 from Tenth-Team/features/documentation

  Show description for 6fb6d50
  ragimov700

  authored
  6fb6d50

  Copy full SHA for 6fb6d50

• added promocode test data

  ragimov700

  committed
  4f76e64

  Copy full SHA for 4f76e64

• additional comments and blog urls

  ragimov700

  committed
  29e335d

  Copy full SHA for 29e335d

• Merge pull request #59 from Tenth-Team/fixtures

  Show description for 0598672
  ragimov700

  authored
  0598672

  Copy full SHA for 0598672

• заявка для логистов download

  VadimGurzhy

  committed
  25abc26

  Copy full SHA for 25abc26

• fix

  VadimGurzhy

  committed
  d681369

  Copy full SHA for d681369

• fix2

  VadimGurzhy

  committed
  aef38e9

  Copy full SHA for aef38e9

• fix4

  VadimGurzhy

  committed
  33317d4

  Copy full SHA for 33317d4

• fix5

  VadimGurzhy

  committed
  6a9f42e

  Copy full SHA for 6a9f42e

• fix6

  VadimGurzhy

  committed
  a68f5fe

  Copy full SHA for a68f5fe

• Merge pull request #61 from Tenth-Team/download_form

  Show description for 9352587
  ragimov700

  authored
  9352587

  Copy full SHA for 9352587

• added methods for ambassadors

  ragimov700

  committed
  6553eea

  Copy full SHA for 6553eea

Commits on Mar 10, 2024

• rework methods for loyalty page

  qwertttyyy

  committed
  f5029fe

  Copy full SHA for f5029fe

• schemas and edit ambassador serializer

  ragimov700

  committed
  84f8797

  Copy full SHA for 84f8797

• fix filters, and add tests

  ragimov700

  committed
  7e63ac0

  Copy full SHA for 7e63ac0

• fix flake8

  ragimov700

  committed
  007f41e

  Copy full SHA for 007f41e

• Merge pull request #64 from Tenth-Team/feature/loyalty_rework

  Show description for f13d192
  ragimov700

  authored
  f13d192

  Copy full SHA for f13d192

• Merge pull request #66 from Tenth-Team/amb

  Show description for 9327c29
  ragimov700

  authored
  9327c29

  Copy full SHA for 9327c29

• cd configured

  ragimov700

  committed
  27cba26

  Copy full SHA for 27cba26

• Merge pull request #67 from Tenth-Team/cd

  Show description for fed20ad
  ragimov700

  authored
  fed20ad

  Copy full SHA for fed20ad