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

Актуализация main #198

Merged
merged 213 commits into from
Apr 22, 2024
Merged

Актуализация main #198

merged 213 commits into from
Apr 22, 2024

Conversation

VladislavYar
Copy link
Collaborator

No description provided.

holohup and others added 30 commits February 21, 2024 15:07
@holohup
first smoketest, some api structure shuffling, deleted commented code
5d2eb38
@holohup
changed global and health endpoint permissions, added djoser, fixed a…
c7969ae 
… bug in urls (v1/v1/)
@holohup
added djoser to requirements.txt
4397260
@holohup
dummy user model to proceed with auth
af680f6
@NECROshizo
Docs/add section db (#23)
bb0adeb 
Добавление ER-диаграммы в read.me
@blakkheart
Feature/docker compose dev (#22)
4a4b23f 
Минорные исправление и добавления health-check.
@VladislavYar
Написан Makefile, дополнены .env.example, README.md, перенесён pyproj…
4cfd9d4 
…ect.toml в корень проекта. (#19)

* Написан Makefile, дополнены .env.example, README.md, перенесён pyproject.toml в корень проекта.

* Разделены make-команды на prod и dev.
@holohup
auth code class and test structure skeleton
272eca0
@VladislavYar
Переделал Makefile, поченил docker-compose для прода, добавил в gitig…
e7d4d41 
…nore статику, чуть переделал README под реалии проекта
@holohup
authcode class, dummy email sender class, some tests
7c2ebff
@holohup
small code optimization - got rid of ._code variable in the AuthCode …
8da9953 
…class, everything is stored in cache from now on
@holohup
user registration endpoint and its tests skeleton
791469a
@holohup
email already exists validation added upon registering + tests
f03b7fb
@holohup
CLIENT now only has 1 instance in user registration endpoint tests
6414991
@holohup
tests to check if email is sent upon posting on the user register end…
4cea98d 
…point and if the code sent is correct
@holohup
test_sent_code_is_correct now checks the code using internal AuthCode…
273b82f 
… checker
@holohup
changed view function to apiview class
08c8743
@holohup
me endpoint - get, patch and delete
c4c16ac
@holohup
me endpoint - get, patch and delete
9d0d59f
add app running, admin, apps, models for motivation and recreation ph…
53548b9 
…rases; add app to installed apps
@holohup
fixes, small updates to models and code, fixed cryptography for code …
0ad91a0 
…generation, new fields for user model
@VladislavYar
Merge pull request #25 from Diary-workout-tracker/feature/expand_make…
d92bad6 
…file

Переделал Makefile, починил docker-compose для прода, добавил в gitignore статику, чуть переделал README под реалии проекта
@holohup
1 migration instead of many
592ac80
@holohup
merge conflicts
677adf8
@holohup
added simplejwt to requirements.txt
e1700dc
@holohup
added simplejwt to requirements.txt
09aa4f3
@holohup
Merge pull request #70 from Diary-workout-tracker/feature/auth_iter2
3387d7d 
Feature/auth iter2
@VladislavYar
Добавил переменную порта в docker-compose.dev.yml, чуть переделал Mak…
f9a1ede 
…efile, поправил команды в README
@VladislavYar
Merge pull request #72 from Diary-workout-tracker/feature/ports_to_va…
49314d2 
…riable

Добавил переменную порта в docker-compose.dev.yml, чуть переделал Makefile, поправил команды в README
@NECROshizo
Feature/models app (#68)
e5646df 
Добавлены модели для бега
VladislavYar and others added 29 commits April 3, 2024 16:28
@VladislavYar
Merge branch 'develop' of github.com:Diary-workout-tracker/diary-work…
d341504 
…out-tracker-backend into develop
@VladislavYar
Merge develop.
e7d08be
@VladislavYar
Merge develop.
8d85933
@holohup
Fixed some issues according to Vlad's comments!
0d6a0af 
peace!
@VladislavYar
Merge branch 'develop' into feature/logic_project_timezone_user
42e0c16
@VladislavYar
Push.
a422f1d
@VladislavYar
Merge branch 'feature/logic_project_timezone_user' of github.com:Diar…
71a0809 
…y-workout-tracker/diary-workout-tracker-backend into feature/logic_project_timezone_user
@VladislavYar
Delete minio.
77c65ce
@holohup
resolved issues
00a5e4a
@VladislavYar
Merge pull request #161 from Diary-workout-tracker/feature/logic_proj…
9188969 
…ect_timezone_user

Feature/logic project timezone user
@holohup
removed comment
67d8c6a
@holohup
removed comment
24a13d3
@holohup
Merge branch 'develop' into feature/recurring_achievements
548e0d8
@holohup
Merge pull request #163 from Diary-workout-tracker/feature/recurring_…
a239d3a 
…achievements

Повторяющиеся ачивки
@holohup
bugfix
b5d5a09
@holohup
Merge pull request #174 from Diary-workout-tracker/feature/recurring_…
98f7fb8 
…achievements

bugfix
@NECROshizo
back js (#178)
3eced25
@NECROshizo
fix 100 trening update close #175
8fd9dcb
@NECROshizo
fix type duration
2b3cd16
@NECROshizo
extra fix add reward achievement
fb98316
@holohup
freezes test and >0 check
67193b0
@holohup
Merge pull request #182 from Diary-workout-tracker/feature/freezes
d73a190 
freezes test and >0 check
@NECROshizo
resolve conflict
04df5ec
@VladislavYar
Correct errors.
85bee76
@VladislavYar
Merge pull request #196 from Diary-workout-tracker/bugfix/QA_issues
ec287ef 
Correct errors.
@VladislavYar
Update README.md
eb817b5
@VladislavYar
Merge pull request #197 from Diary-workout-tracker/VladislavYar-patch-1
36be401 
Update README.md
@VladislavYar
Update README.md
2570622
@VladislavYar
Merge branch 'main' into develop
d5138ab
@VladislavYar VladislavYar merged commit 6d7e4de into main Apr 22, 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.
5 participants
@VladislavYar @holohup @NECROshizo @blakkheart @Luna-luns