Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mvp #69

Merged
merged 163 commits into from
Mar 10, 2024
Merged

mvp #69

merged 163 commits into from
Mar 10, 2024

Conversation

ragimov700
Copy link
Contributor

No description provided.

qwertttyyy and others added 30 commits February 23, 2024 17:17
@qwertttyyy
add registration and authentication
325186d
@antonata-c
Added docker compose local version
07523e3
@antonata-c
Added backend dockerfile and env handling
451f943
@antonata-c
Revert "Added backend dockerfile and env handling"
34a09a6 
This reverts commit 451f943.
@antonata-c
Revert "Revert "Added backend dockerfile and env handling""
2fa506d 
This reverts commit 34a09a6.
@antonata-c
Added static gitignore
5e3c526
@antonata-c
Reworked gunicorn to default server startup
055a1bd
@qwertttyyy
made edits
f489864
@ragimov700
added ambassadors app and models
3b991d4
@ragimov700
Merge pull request #7 from Tenth-Team/local_docker
7245d90 
Added dockerfile, docker-compose, nginx, improved settings
@ragimov700
Merge branch 'develop' into feature/users
d8891c8
@ragimov700
Merge pull request #6 from Tenth-Team/feature/users
43fa2d4 
Feature/users
@ragimov700
Merge branch 'develop' into ambassadors
b6733f3
@ragimov700
Merge pull request #8 from Tenth-Team/ambassadors
69b0cc2 
added ambassadors app and models
@ragimov700
base api config
0620fa2
@ragimov700
Merge pull request #9 from Tenth-Team/api
7e15ab9 
base api config
@VadimGurzhy
CI
8340933
@ragimov700
ambassador viewset and serializer
2a690b6
@ragimov700
Merge pull request #10 from Tenth-Team/CI
6809dfb 
CI
@ragimov700
Merge pull request #14 from Tenth-Team/api-amb
27e6339 
ambassador viewset and serializer
@antonata-c
Added static_root and daphne
96416b9
@antonata-c
Added docker-compose for production
a2bc11f
@antonata-c
Fixed backend compose command
87acce2
@ragimov700
Merge pull request #15 from Tenth-Team/docker_prod
3053170 
Added static_root and daphne
@qwertttyyy
added Content model
eaed660
@ragimov700
integration with yandex forms
53c6c53
@ragimov700
Merge pull request #17 from Tenth-Team/api-amb
7c0f413 
integration with yandex forms
@ragimov700
added csrf setting
27f972b
@ragimov700
models settings
0186be1
@ragimov700
config admin for ambassadors
10b2797
ragimov700 and others added 29 commits March 8, 2024 20:27
@ragimov700
Merge pull request #54 from Tenth-Team/optimization
4788ce7 
queries optimized
@qwertttyyy
added content tests
8aed216
@qwertttyyy
fix imports
dc8d0e2
@antonata-c
Merge commit
e2a08e9
@antonata-c
fixes for lint
67b7204
@antonata-c
Add promocode tests
ab32fbd
@ragimov700
Merge pull request #58 from Tenth-Team/tests/promocode
a3cc81d 
Add promocode tests
@ragimov700
Merge branch 'develop' into tests/content
b200f1a
@ragimov700
Merge pull request #55 from Tenth-Team/tests/content
dc57951 
Tests/content
@ragimov700
Merge pull request #51 from Tenth-Team/features/documentation
6fb6d50 
Features/documentation
@ragimov700
added promocode test data
4f76e64
@ragimov700
additional comments and blog urls
29e335d
@ragimov700
Merge pull request #59 from Tenth-Team/fixtures
0598672 
added promocode test data
@VadimGurzhy
заявка для логистов download
25abc26
@VadimGurzhy
fix
d681369
@VadimGurzhy
fix2
aef38e9
@VadimGurzhy
fix4
33317d4
@VadimGurzhy
fix5
6a9f42e
@VadimGurzhy
fix6
a68f5fe
@ragimov700
Merge pull request #61 from Tenth-Team/download_form
9352587 
Download form
@ragimov700
added methods for ambassadors
6553eea
@qwertttyyy
rework methods for loyalty page
f5029fe
@ragimov700
schemas and edit ambassador serializer
84f8797
@ragimov700
fix filters, and add tests
7e63ac0
@ragimov700
fix flake8
007f41e
@ragimov700
Merge pull request #64 from Tenth-Team/feature/loyalty_rework
f13d192 
Feature/loyalty rework
@ragimov700
Merge pull request #66 from Tenth-Team/amb
9327c29 
Amb
@ragimov700
cd configured
27cba26
@ragimov700
Merge pull request #67 from Tenth-Team/cd
fed20ad 
cd configured
@ragimov700 ragimov700 merged commit 16c4e82 into main Mar 10, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ragimov700 @qwertttyyy @antonata-c @VadimGurzhy