devops/encoach_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263 Commits 12 Branches 0 Tags
dc04fdf74cc74d7e2f2da61169261e3d0c35a14b
Commit Graph

263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos-Mesquita
dc04fdf74c Dindn't solve all conflicts in previous commit 2024-11-06 00:50:56 +00:00
Carlos-Mesquita
8233498f51 Solving merge conflicts 2024-11-06 00:11:19 +00:00
Carlos-Mesquita
98565f3468 Some tmp files were committed by mistake 2024-11-04 23:33:04 +00:00
Carlos-Mesquita
84ed2f2f6a Changes to endpoints so they allow to only get context and then the exercises as well as tidying up a bit 2024-11-04 23:31:48 +00:00
Tiago Ribeiro
95962f9bce Trying something out with the batch user 2024-10-29 10:40:32 +00:00
Tiago Ribeiro
8720c590e0 Merge branch 'develop' of bitbucket.org:ecropdev/ielts-be into develop 2024-10-17 11:43:18 +01:00
Tiago Ribeiro
163e4cf42d Updated the batch users to work with entities 2024-10-17 11:41:49 +01:00
Carlos-Mesquita
2a032c5aba Fastapi refactor update 2024-10-01 19:31:01 +01:00
Cristiano Ferreira
5289f33599 Update video generation to use elai. 2024-10-01 18:12:56 +01:00
carlos.mesquita
164f47994b Merged in feature/training-content (pull request #31) 
Feature/training content

Approved-by: Tiago Ribeiro
 2024-09-23 07:41:08 +00:00
carlos.mesquita
895aaa1b33 Merged develop into feature/training-content 2024-09-22 22:27:02 +00:00
Carlos Mesquita
aa1433e9ea UUID wasn't being converted to string, before it used the firebase id and when transitioning to mongo this bug was introduced 2024-09-22 23:25:54 +01:00
carlos.mesquita
8eb5fb6d5f Merged master into feature/training-content 2024-09-08 20:47:50 +00:00
Carlos Mesquita
c004d9c83c Pydantic was causing validation errors when passportID was an int 2024-09-08 21:47:02 +01:00
carlos.mesquita
66abc42abb Merged in feature/training-content (pull request #29) 
And this is why llm code shouldn't be copy pasted blindly

Approved-by: Tiago Ribeiro
 2024-09-08 08:46:06 +00:00
Carlos Mesquita
2b59119eca And this is why llm code shouldn't be copy pasted blindly 2024-09-08 02:29:56 +01:00
Tiago Ribeiro
b9a35281ec Merge branch 'master' into develop 2024-09-08 00:59:33 +01:00
carlos.mesquita
2bbc1f456d Merged in feature/training-content (pull request #28) 
Forgot to str() on a uuid

Approved-by: Tiago Ribeiro
 2024-09-07 23:48:39 +00:00
Carlos Mesquita
e8ec862f86 Merge remote-tracking branch 'origin/master' into feature/training-content 2024-09-08 00:39:00 +01:00
Carlos Mesquita
8d4584b8b7 Forgot to str() on a uuid 2024-09-08 00:38:35 +01:00
carlos.mesquita
7a0424aa33 Merged in feature/training-content (pull request #27) 
Feature/training content

Approved-by: Tiago Ribeiro
 2024-09-07 22:10:55 +00:00
Carlos Mesquita
24ce198dfd Forgot to change the tips script to mongo 2024-09-07 23:09:00 +01:00
Carlos Mesquita
81911e635c Merge remote-tracking branch 'origin/master' into feature/training-content 2024-09-07 23:04:20 +01:00
Carlos Mesquita
849db06760 Merge branch 'feature/training-content' of https://bitbucket.org/ecropdev/ielts-be into feature/training-content 2024-09-07 23:04:18 +01:00
Carlos Mesquita
6a38164f9b Merge remote-tracking branch 'origin/master' into feature/training-content 2024-09-07 23:03:25 +01:00
Tiago Ribeiro
8ae9b64f1a Merged in release/mongodb-migration (pull request #26) 
Release/mongodb migration
 2024-09-07 21:54:25 +00:00
Tiago Ribeiro
676f660f3e Merged master into release/mongodb-migration 2024-09-07 21:54:00 +00:00
carlos.mesquita
ddf050d692 Merged in feature/training-content (pull request #25) 
ENCOA-69 Pathways 2 Reading and Writing Tips

Approved-by: Tiago Ribeiro
 2024-09-07 21:50:21 +00:00
Carlos Mesquita
6cb7c07f57 Firestore to Mongodb 2024-09-07 19:14:40 +01:00
carlos.mesquita
8c60f4596f Merged master into feature/training-content 2024-09-07 10:43:53 +00:00
Carlos Mesquita
cd11fa38ae Pathways 2 Reading and Writing Tips 2024-09-07 11:42:31 +01:00
carlos.mesquita
a328f01d2e Merged in feature/level-file-upload (pull request #24) 
Added missing fillBlanks mc variant that was in UTAS to custom level

Approved-by: Tiago Ribeiro
 2024-09-06 08:52:42 +00:00
Carlos Mesquita
a931c5ec2e Added missing fillBlanks mc variant that was in UTAS to custom level 2024-09-06 09:36:24 +01:00
carlos.mesquita
bfc9565e85 Merged in develop (pull request #23) 
Develop

Approved-by: Tiago Ribeiro
 2024-09-05 11:29:08 +00:00
carlos.mesquita
3d70bcbfd1 Merged in feature/level-file-upload (pull request #22) 
Feature/level file upload

Approved-by: Tiago Ribeiro
 2024-09-05 10:51:26 +00:00
carlos.mesquita
a2cfa335d7 Merged develop into feature/level-file-upload 2024-09-05 10:48:22 +00:00
Carlos Mesquita
0427d6e1b4 Deleted google creds ENV from Dockerfile since those will be supplied by cloud run 2024-09-05 11:47:34 +01:00
Carlos Mesquita
31c6ed570a Merge remote-tracking branch 'origin/bug/create-default-groups-if-not-already' into feature/level-file-upload 2024-09-05 11:43:11 +01:00
Carlos Mesquita
3a27c42a69 Removed .env, will add it to gitignore in next commit 2024-09-05 11:41:56 +01:00
Tiago Ribeiro
260dba1ee6 Merged in bug/create-default-groups-if-not-already (pull request #21) 
Updated the code to create the Students/Teachers group if it does not exist yet
 2024-09-05 10:11:16 +00:00
Tiago Ribeiro
a88d6bb568 Updated the code to create the Students/Teachers group if it does not exist yet 2024-09-05 10:56:58 +01:00
carlos.mesquita
f0f904f2e4 Merged in feature/level-file-upload (pull request #20) 
Feature/level file upload

Approved-by: Tiago Ribeiro
 2024-09-04 16:14:20 +00:00
Carlos Mesquita
a23bbe581a Merge branch 'feature/level-file-upload' of https://bitbucket.org/ecropdev/ielts-be into feature/level-file-upload 2024-09-04 17:10:16 +01:00
Carlos Mesquita
bb26282d25 Forgot to change this, should not affect, but still 2024-09-04 17:09:51 +01:00
carlos.mesquita
73c29cda25 Merged master into feature/level-file-upload 2024-09-04 16:07:48 +00:00
carlos.mesquita
aaa3361575 Merged master into feature/level-file-upload 2024-09-04 16:01:12 +00:00
Carlos Mesquita
94a16b636d Merge branch 'feature/level-file-upload' of https://bitbucket.org/ecropdev/ielts-be into feature/level-file-upload 2024-09-04 17:00:03 +01:00
Carlos Mesquita
cffec795a7 Swapped .env vars 2024-09-04 16:59:47 +01:00
carlos.mesquita
b2b4dfb74e Merged in feature/level-file-upload (pull request #18) 
Switched cli token to GOOGLE_APPLICATION_CREDENTIALS
 2024-09-04 11:00:22 +00:00
carlos.mesquita
2716f52a0a Merged develop into feature/level-file-upload 2024-09-04 10:57:11 +00:00