Commit graph

78 commits

Author SHA1 Message Date
d5ac464ee9
Merge branch 'dev' into release/0.2.0 2025-04-24 21:58:52 +02:00
Timo De Meyst
0e44de0e7c chore: package-lock die zeker en vast klopt! 2025-04-24 21:22:06 +02:00
Timo De Meyst
8240059c2c
Merge branch 'dev' into feat/leerpad-vragen 2025-04-24 21:10:15 +02:00
322992263d
fix: Vulnerabilities 2025-04-24 14:46:47 +02:00
2710e1354e
Merge branch 'dev' into test/e2e-setup 2025-04-24 10:07:31 +02:00
Timo De Meyst
81ae0f2086 fix: update package.json 2025-04-23 20:24:46 +02:00
2e465e707b
Merge branch 'dev' into test/e2e-setup 2025-04-21 14:36:44 +02:00
laurejablonski
7144359283 fix: probleem inloggen mergeconflict 2025-04-21 09:10:46 +02:00
c68f0872bf
fix: package.json en package-lock.json 2025-04-20 16:30:42 +02:00
Joyelle Ndagijimana
790ef985be feat(frontend): CreateAssignment.vue accepteert hruid vanuit leerpad pagina 2025-04-19 17:13:38 +02:00
Joyelle Ndagijimana
a421b1996a Merge branch 'dev' into feat/assignment-page
# Conflicts:
#	backend/package.json
#	common/src/interfaces/assignment.ts
#	frontend/src/controllers/learning-paths.ts
#	frontend/src/i18n/locale/de.json
#	frontend/src/i18n/locale/en.json
#	frontend/src/i18n/locale/fr.json
#	frontend/src/i18n/locale/nl.json
#	frontend/src/views/assignments/CreateAssignment.vue
#	package-lock.json
2025-04-19 16:58:08 +02:00
Adriaan Jacquet
90f43e74ba merge: fixed merge conflicts 2025-04-19 13:44:36 +02:00
Joyelle Ndagijimana
83f01830e3 feat(frontend): Merge dev into feat/assignment 2025-04-18 17:13:04 +02:00
Adriaan Jacquet
01a0e7125a fix: resterende merge errors gefixt 2025-04-17 18:58:33 +02:00
Adriaan Jacquet
5a593cb88f merge: merge fix/183-post-assignment into dev 2025-04-17 18:51:17 +02:00
Gerald Schmittinger
dd2cdf3fe9 Merge remote-tracking branch 'origin/dev' into feat/indieningen-kunnen-posten-en-bekijken-#194
# Conflicts:
#	backend/tests/setup-tests.ts
2025-04-17 00:40:02 +02:00
Gerald Schmittinger
9c638b11f6 fix(backend): Update MikroORM, Fix voor 'pks not iterable' problem in Groups 2025-04-15 11:03:41 +02:00
f80f4d48a1
chore: Update package-lock.json 2025-04-13 21:03:23 +02:00
1ccbfd6c38
Merge pull request #188 from SELab-2/refactor/qol
refactor: Quality of Life changes
2025-04-13 08:39:13 +02:00
6574a7eee5
fix(frontend): uuid dependency
Closes #182
2025-04-09 12:29:39 +02:00
Joyelle Ndagijimana
9aae5a3a46 feat(frontend): echte assignment titel, description en klas worden getoond 2025-04-08 21:08:07 +02:00
Joyelle Ndagijimana
23947ecd92 feat(frontend): controllers integreren in assignments 2025-04-07 21:18:09 +02:00
Gerald Schmittinger
9135b9c5b0 feat(backend): Functionaliteit toegevoegd om alle submissions zichtbaar voor een bepaalde leerling of leerkracht op te vragen. 2025-04-07 19:23:46 +02:00
7e46ce9c5f
fix: Linting op Actions 2025-04-02 20:31:40 +02:00
9470a4ddf9
fix: Shared pkgs importeren 2025-04-02 17:32:14 +02:00
a4408b5bc0
Merge branch 'dev' into refactor/common 2025-04-01 21:38:50 +02:00
2866894707
fix: Missing modules (?) 2025-04-01 21:09:19 +02:00
8bf927d1c9
refactor(common): Introduceer common package 2025-03-31 18:31:12 +02:00
588c556949
Merge branch 'dev' into refactor/linting 2025-03-30 22:48:26 +02:00
dependabot[bot]
ba38356b30
chore(deps-dev): bump vite from 6.1.1 to 6.1.2
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.1.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.1.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-25 14:53:15 +00:00
586f32ffa3
chore: Update package-lock.json 2025-03-23 14:34:47 +01:00
Gabriellvl
4698311062 Merge remote-tracking branch 'origin/dev' into feat/user-homepage
# Conflicts:
#	package-lock.json
2025-03-22 21:25:19 +01:00
Gabriellvl
2b509774b8 feat: tan stack theme query 2025-03-22 00:59:37 +01:00
Joyelle Ndagijimana
501ea6259c feat: titel en dropdowns layout aangemaakt 2025-03-19 00:14:44 +01:00
Gerald Schmittinger
01b3fab568 refactor(backend): DatabaseLearningPathProvider (& gerelateerde) overzichtelijker gemaakt. 2025-03-17 23:11:01 +01:00
d020c68600
Merge branch 'dev' into docs/swagger-autogen 2025-03-13 21:59:00 +01:00
5986ca57bf
Merge branch 'dev' into docs/swagger-autogen 2025-03-13 21:39:35 +01:00
Adriaan Jacquet
b5390258e3 fix: import errors van gabe gefixt, teacher en student abstractie weggedaan 2025-03-13 18:44:41 +01:00
Gabriellvl
6404335040 MERGE: dev ino feat/service-layer 2025-03-13 17:42:04 +01:00
79393d6552
Merge branch 'dev' into test/testen-voor-datalaag-#87 2025-03-13 14:54:57 +01:00
Laure Jablonski
656f7f15b7 fix: mikro orm juiste versies 2025-03-12 22:04:59 +01:00
Laure Jablonski
9626de951e fix: backend werkt op windows 2025-03-12 21:28:11 +01:00
Gerald Schmittinger
a30c4d0d32 feat(backend): LearningPathPersonalizingService geïmplementeerd 2025-03-11 04:08:32 +01:00
Gerald Schmittinger
cd0a3a8a7b Merge remote-tracking branch 'origin/dev' into feature/own-learning-objects
# Conflicts:
#	backend/package.json
#	backend/src/config.ts
#	backend/src/controllers/learningObjects.ts
#	backend/src/controllers/learningPaths.ts
#	backend/src/data/content/attachment-repository.ts
#	backend/src/data/content/learning-object-repository.ts
#	backend/src/data/content/learning-path-repository.ts
#	backend/src/data/repositories.ts
#	backend/src/entities/content/learning-path.entity.ts
#	backend/src/exceptions.ts
#	backend/src/routes/learning-objects.ts
#	backend/src/services/learningObjects.ts
#	backend/src/services/learningPaths.ts
#	backend/src/util/apiHelper.ts
#	backend/src/util/envvars.ts
#	package-lock.json
2025-03-11 03:01:18 +01:00
dependabot[bot]
8a53baa125
chore(deps): bump axios from 1.8.1 to 1.8.2
Bumps [axios](https://github.com/axios/axios) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 14:57:02 +00:00
Gerald Schmittinger
de0199de96 Merge remote-tracking branch 'origin/dev' into chore/login
# Conflicts:
#	backend/.env.example
#	backend/package.json
#	backend/src/app.ts
#	backend/src/routes/login.ts
#	backend/src/routes/student.ts
#	docker-compose.yml
#	frontend/src/App.vue
#	frontend/src/views/HomePage.vue
#	frontend/src/views/LoginPage.vue
#	package-lock.json
2025-03-09 23:42:38 +01:00
bf36790b28
Merge branch 'chore/login' into docs/swagger-autogen 2025-03-09 09:27:42 +01:00
Gerald Schmittinger
463c8c9fc0 chore(backend): Aanpassingen Dwengo Learning-Object-Repository
Processing uit Dwengo Learning-Object-Repository geconverteerd naar TypeScript en aangepast aan onze app.

Functionaliteit van Dwengo Learning-Object-Repository in ons project gekopiëerd en deels aanBestanden die enkel types of interfaces exporteren hernoemd naar *.d.tsgepast aan TypeScript en ons project.
2025-03-07 23:20:57 +01:00
ab8ece2a76
docs(backend): Setup swagger-autogen 2025-03-07 20:17:53 +01:00
Laure Jablonski
5502c6c58e test: student repository is getest 2025-03-07 11:48:52 +01:00