laurejablonski
cfcddf0dab
fix: zorg dat testleerling tussen database studenten komt en dat klassen een juist geformatteerde id hebben
2025-04-04 21:40:45 +02:00
laurejablonski
8218aae6ec
fix: problee m met mergen en zorgen student Gerald in db komt bij npm run dev runnen
2025-04-04 18:18:50 +02:00
laurejablonski
1ffd77cce7
Merge branch 'feat/frontend-controllers-adriaan' into feat/pagina-overzicht-klassen-voor-student
2025-04-04 16:51:13 +02:00
laurejablonski
7cba7f1fef
Merge branch 'dev' into feat/pagina-overzicht-klassen-voor-student
2025-04-04 16:50:13 +02:00
Timo De Meyst
dbc1da741c
Merge pull request #164 (ci: Automatische Deployment) from SELab-2/github-actions/deployment
...
ci: Automatische Deployment up-to-date met nieuwe docker compose structuur
Linting rule wordt gebypassed omdat de linting al is opgelost op dev, maar gewoon nog niet op deze branch (na de merge lost dit zichzelf dus op).
2025-04-04 12:15:54 +02:00
laurejablonski
aa43a8297d
Merge branch 'dev' into feat/pagina-overzicht-klassen-voor-student
2025-04-04 10:56:44 +02:00
Lint Action
f87c943530
style: fix linting issues met Prettier
2025-04-03 10:41:32 +00:00
Adriaan Jacquet
cf81a7030a
Merge branch 'feat/frontend-controllers-adriaan' of github.com:SELab-2/Dwengo-1 into feat/frontend-controllers-adriaan
2025-04-03 12:40:42 +02:00
Adriaan Jacquet
beb3bacfa7
fix: response types en import errors gefixt
2025-04-03 12:40:32 +02:00
Lint Action
6664209e8c
style: fix linting issues met ESLint
2025-04-03 09:46:47 +00:00
Adriaan Jacquet
7f7df53d79
merge: fixed merge conflicts on local branch
2025-04-03 11:44:21 +02:00
Adriaan Jacquet
c85c26a878
feat: types toegevoegd in frontend controller assignment
2025-04-03 11:43:31 +02:00
Lint Action
2a9668c585
style: fix linting issues met Prettier
2025-04-03 09:40:56 +00:00
Lint Action
d5ce82c657
style: fix linting issues met ESLint
2025-04-03 09:40:51 +00:00
Adriaan J.
9f975977e0
Merge branch 'dev' into feat/frontend-controllers-adriaan
2025-04-03 11:38:31 +02:00
Gabriellvl
2b2c97a82d
Merge pull request #142 from SELab-2/feat/user-routes
...
Lint / Run linters (push) Has been cancelled
feat: endpoints finaliseren users
2025-04-03 11:17:28 +02:00
28d5562734
Merge pull request #160 from SELab-2/refactor/common
...
refactor: Verplaats DTO's naar gemeenschappelijk package
2025-04-03 11:02:46 +02:00
Gabriellvl
7374511e31
Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes
2025-04-03 11:00:56 +02:00
Gabriellvl
1940be31fb
Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
2025-04-03 11:00:25 +02:00
782fc2be19
fix: Cleanup
...
Co-authored-by: Adriaan Jacquet <adriaanjacquet@gmail.com>
2025-04-03 10:53:45 +02:00
Lint Action
80939cd93c
style: fix linting issues met Prettier
2025-04-03 08:12:51 +00:00
Gabriellvl
01b40992e2
Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
...
# Conflicts:
# backend/src/controllers/learning-objects.ts
2025-04-03 10:10:47 +02:00
Gabriellvl
2f595e615f
fix: import in test
2025-04-03 09:59:25 +02:00
Gabriellvl
94e25fbcde
fix: imports + merge
2025-04-03 09:51:53 +02:00
Gabriellvl
084f4fcdbd
Merge remote-tracking branch 'origin/dev' into feat/user-routes
...
# Conflicts:
# backend/src/controllers/learning-objects.ts
# frontend/src/controllers/controllers.ts
# frontend/src/queries/themes.ts
2025-04-03 09:48:57 +02:00
ce080f4d22
Merge pull request #166 from SELab-2/test/config
...
test: Update config
2025-04-03 09:00:42 +02:00
86b3e0e4c4
docs: Omgevingsbestanden
2025-04-03 08:52:23 +02:00
8a0b4b62a7
test(backend): Verhoog vitest timeout
2025-04-03 08:32:32 +02:00
6097be3c79
test(backend): Omgevingsvariabelen files
2025-04-03 08:31:25 +02:00
ced27c148b
fixup! fix(backend): Restore sort
2025-04-03 07:53:05 +02:00
6d7d29ce3c
fix(backend): Restore sort
2025-04-03 07:44:22 +02:00
Lint Action
9f60c43522
style: fix linting issues met Prettier
2025-04-03 05:35:57 +00:00
52bc02a9f9
Merge branch 'dev' into refactor/common
2025-04-03 07:34:47 +02:00
Gerald Schmittinger
14eef0269b
Merge pull request #161 from SELab-2/feat/pagina-om-leerpaden-te-bekijken-#41
...
feat: Pagina om leerpaden te bekijken (#41 ), zoekpagina voor leerpaden (#135 ), thema-overzichtspagina voor leerpaden (#31 ).
2025-04-02 23:33:00 +02:00
Gabriellvl
3ec08599e5
fix: imports
2025-04-02 23:03:23 +02:00
Gabriellvl
073dc8df47
Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
2025-04-02 22:58:24 +02:00
Lint Action
0bdee56dc3
style: fix linting issues met Prettier
2025-04-02 18:32:29 +00:00
7e46ce9c5f
fix: Linting op Actions
2025-04-02 20:31:40 +02:00
80dc3acca7
Revert "ci: Merge testing actions"
...
This reverts commit f2d165aa60
2025-04-02 20:03:08 +02:00
f2d165aa60
ci: Merge testing actions
2025-04-02 19:49:40 +02:00
Gabriellvl
3c1eb82ce3
fix: merge + fixes
2025-04-02 19:48:42 +02:00
c549f51c49
fix: Actions
2025-04-02 19:38:36 +02:00
Gabriellvl
7d8a0fcbb2
Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
...
# Conflicts:
# backend/src/controllers/students.ts
# backend/src/controllers/teachers.ts
# backend/src/interfaces/question.ts
# backend/src/services/classes.ts
# backend/src/services/students.ts
# backend/src/services/teachers.ts
2025-04-02 19:20:20 +02:00
2dbadc7eab
refactor(backend): Linting
2025-04-02 18:20:09 +02:00
f537830b15
fix(backend): Zet Docker terug
2025-04-02 18:19:41 +02:00
e55b96bc08
fix: npm commandos
2025-04-02 18:14:10 +02:00
5d312d8c29
fix(backend): Missende import
2025-04-02 17:38:37 +02:00
f07a1ec867
refactor(backend): ClassJoinRequestStatus -> common
2025-04-02 17:35:46 +02:00
9470a4ddf9
fix: Shared pkgs importeren
2025-04-02 17:32:14 +02:00
Gabriellvl
fe5102dd19
Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes
2025-04-02 14:56:45 +02:00
