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.

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

Development #1529

Merged
merged 86 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from 82 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
9a1bbaa
add micro cohorts to cohort model
gustavomm19 Nov 7, 2024
1faf214
Merge branch 'development' of https://github.com/gustavomm19/apiv2 in…
gustavomm19 Nov 14, 2024
c44da0d
add color to cohorts
gustavomm19 Nov 14, 2024
6e57c0c
add color to serializer
gustavomm19 Nov 14, 2024
7bf3fce
create cohort users in micro cohorts when cohort user is created in t…
gustavomm19 Nov 14, 2024
039a8c1
add signal to graduate student from main cohorts after it is graduate…
gustavomm19 Nov 15, 2024
1e85dbd
add cohort to user me task serializer
gustavomm19 Nov 15, 2024
490a0c9
add cohort user only if it does not exist yet
gustavomm19 Nov 18, 2024
f629cf5
add tests to graduate saas main cohort on all micro cohort student gr…
gustavomm19 Nov 20, 2024
b8ff2ca
add tests to new_cohort_user signal
gustavomm19 Nov 27, 2024
79c19fd
fix tests, add works api
jefer94 Dec 2, 2024
5b1b2c3
Merge pull request #1510 from jefer94/feat/works-api
jefer94 Dec 2, 2024
b538f05
Merge pull request #1494 from gustavomm19/marketing-cohorts
jefer94 Dec 3, 2024
2b4bd5a
adding featured course to tech
lumi-tip Dec 4, 2024
00fd11a
Merge pull request #1511 from lumi-tip/development-lumi-7920
jefer94 Dec 5, 2024
4e4371d
Merge pull request #1518 from breatheco-de/main
tommygonzaleza Dec 16, 2024
be90f0c
Migrations conflict fixed
tommygonzaleza Dec 16, 2024
4099ac8
add micro cohort users in the same as the main cohort user
gustavomm19 Dec 18, 2024
fd3393b
Merge pull request #1519 from gustavomm19/marketing-cohorts
jefer94 Dec 18, 2024
898b2fb
Merge branch 'main' of https://github.com/breatheco-de/apiv2 into dev…
jefer94 Dec 19, 2024
839b75f
fix tests, fix google oauth
jefer94 Dec 23, 2024
49e2db2
remove prints
jefer94 Dec 23, 2024
015b6e2
Add id in studentPOSTSerializer
avanegasp Dec 26, 2024
25e9120
Merge branch 'development' into available_as_saas
avanegasp Dec 26, 2024
3c91dfb
add micro cohorts to public cohort serializer
gustavomm19 Dec 26, 2024
6236f13
Merge pull request #1523 from gustavomm19/micro-cohorts-serializer
jefer94 Dec 26, 2024
d2eff12
Add id in different tests
avanegasp Dec 30, 2024
a6e99e5
Merge pull request #1524 from avanegasp/available_as_saas
jefer94 Dec 30, 2024
91de21e
add endpoints to be used by works api
jefer94 Dec 31, 2024
f014b2d
Merge pull request #1525 from jefer94/development
jefer94 Dec 31, 2024
6c1ad70
add App model to prevent error on migrations
gustavomm19 Jan 7, 2025
64e5287
Merge pull request #1527 from gustavomm19/temporary-fix
tommygonzaleza Jan 7, 2025
8caa0d8
add commands to fix out dated assets slugs in syllabus and tasks
gustavomm19 Jan 8, 2025
7d5ad93
Merge pull request #1528 from gustavomm19/syllabus-assets
tommygonzaleza Jan 9, 2025
1f36bc8
Merge pull request #1532 from breatheco-de/main
tommygonzaleza Jan 10, 2025
d39005c
small change to include ? and !
lumi-tip Jan 16, 2025
a940e23
small change to include ? and !
lumi-tip Jan 16, 2025
2640206
only remove h1s
lumi-tip Jan 16, 2025
5096dc4
only remove h1s
lumi-tip Jan 16, 2025
c456a99
can access flag
jefer94 Jan 17, 2025
c586793
Merge pull request #1534 from lumi-tip/development-lumi-8091
tommygonzaleza Jan 21, 2025
009610c
Merge branch 'development' of https://github.com/breatheco-de/apiv2 i…
jefer94 Jan 21, 2025
b7dc554
update deps
jefer94 Jan 21, 2025
af2bf64
purge pipenv
jefer94 Jan 22, 2025
b823d86
x
jefer94 Jan 22, 2025
64d82eb
remove sqlalchemy
jefer94 Jan 22, 2025
c35b092
add changes
jefer94 Jan 22, 2025
4bba6e6
x
jefer94 Jan 22, 2025
56ad215
update precommit
jefer94 Jan 22, 2025
728c37a
x
jefer94 Jan 22, 2025
ed79e0f
Merge pull request #1535 from jefer94/development
jefer94 Jan 22, 2025
94a6fbd
update runtime
jefer94 Jan 22, 2025
206e098
a
jefer94 Jan 22, 2025
6a9095b
x
jefer94 Jan 22, 2025
5c32619
expand admissions me serializer to include permissions and settings
gustavomm19 Jan 23, 2025
abfe5bf
Merge pull request #1536 from gustavomm19/admissions-serializer
tommygonzaleza Jan 23, 2025
ce8c65e
fix tests
jefer94 Jan 24, 2025
195f4a6
Merge branch 'development' of https://github.com/breatheco-de/apiv2 i…
jefer94 Jan 24, 2025
4b6d0c9
Merge pull request #1537 from jefer94/feat/can-access-flag
jefer94 Jan 24, 2025
d2e2953
Merge branch 'main' of https://github.com/breatheco-de/apiv2 into dev…
jefer94 Jan 24, 2025
6c17075
fix tests, merge main
jefer94 Jan 24, 2025
424ba88
fix gitpod
jefer94 Jan 24, 2025
250b504
add python version file
jefer94 Jan 24, 2025
dddeb9c
fix install script
jefer94 Jan 24, 2025
c414272
fix celery start up
jefer94 Jan 25, 2025
e72614a
add dotenv plugin
jefer94 Jan 25, 2025
cc9a3ae
adding new endpoint for checkin events of user
lumi-tip Jan 27, 2025
693406e
add flag --all to generate_asset_context command
gustavomm19 Jan 27, 2025
bd134de
fix conditional
gustavomm19 Jan 27, 2025
c125315
fix celery
jefer94 Jan 27, 2025
18bffd3
test works
lumi-tip Jan 27, 2025
45ebeb2
Update generate_asset_context.py
tommygonzaleza Jan 27, 2025
5ede2e8
Merge pull request #1539 from gustavomm19/context-command
tommygonzaleza Jan 27, 2025
6f8c062
fix changing plan financing
jefer94 Jan 28, 2025
def948b
fix test
jefer94 Jan 28, 2025
dbd03bf
Merge pull request #1540 from jefer94/development
jefer94 Jan 28, 2025
44904c8
fix possible issue with next payment at
jefer94 Jan 28, 2025
1edfde6
Merge branch 'development' of https://github.com/breatheco-de/apiv2 i…
jefer94 Jan 28, 2025
5ea5697
allow to buy void consumables
gustavomm19 Jan 28, 2025
3d8ca35
Merge pull request #1541 from gustavomm19/consumables-allow
jefer94 Jan 28, 2025
8b57abe
changes requeste
lumi-tip Jan 28, 2025
45b4339
Merge pull request #1538 from lumi-tip/development-lumi-7608
tommygonzaleza Jan 29, 2025
03effe0
fix subscriptions
jefer94 Jan 30, 2025
2bff715
Merge pull request #1543 from jefer94/development
jefer94 Jan 30, 2025
5581e86
fix condition for delay fix_subscription_next_payment_at
jefer94 Jan 30, 2025
4198ada
Merge branch 'development' of https://github.com/breatheco-de/apiv2 i…
jefer94 Jan 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# alpine has very much issues with python
# alpine has so much issues with python
FROM mcr.microsoft.com/devcontainers/python:3

ENV PYTHONUNBUFFERED=1
Expand All @@ -12,14 +12,14 @@ RUN apt-get update \
RUN curl -fsSL https://get.docker.com -o get-docker.sh \
&& sh ./get-docker.sh

RUN pip install pipenv
RUN pip install poetry pipx

# WORKDIR /usr/src



COPY ./Pipfile ./Pipfile
COPY ./Pipfile.lock ./Pipfile.lock
COPY ./pyproject.toml ./pyproject.toml
COPY ./poetry.lock ./poetry.lock

RUN pipenv install --system --deploy --ignore-pipfile
RUN poetry install
COPY . .
5 changes: 3 additions & 2 deletions .devcontainer/onCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

python -m scripts.install
docker-compose up -d redis postgres
pipenv run migrate
pipenv run python manage.py loaddata breathecode/*/fixtures/dev_*.json
poetry run migrate
poetry run python manage.py loaddata breathecode/*/fixtures/dev_*.json
poetry run python manage.py create_academy_roles
docker-compose down
Loading
Loading