Tiago Ribeiro
|
392eac2ef9
|
Merge branch 'main' into develop
|
2024-09-08 19:57:57 +01:00 |
|
Tiago Ribeiro
|
298901a642
|
Updated the UserList to show the corporates
|
2024-09-08 19:50:59 +01:00 |
|
Tiago Ribeiro
|
31a01a3157
|
Allow admins create other admins
|
2024-09-08 19:27:12 +01:00 |
|
Tiago Ribeiro
|
49e8237e99
|
A bit of error handling I guess
|
2024-09-08 18:54:44 +01:00 |
|
Tiago Ribeiro
|
d5769c2cb9
|
Updated more of the page
|
2024-09-08 18:39:52 +01:00 |
|
Tiago Ribeiro
|
620e4dd787
|
Solved some problems, bypassed some stuff
|
2024-09-08 11:35:09 +01:00 |
|
Joao Ramos
|
2e065eddcb
|
Added an workaround for the broken email system
|
2024-09-08 10:19:49 +01:00 |
|
Joao Ramos
|
4e91b2f1fb
|
ENCOA-202: Fixed issue updating user
|
2024-09-08 10:08:24 +01:00 |
|
Tiago Ribeiro
|
cdd42b2f07
|
Merge branch 'main' into migration-mongodb
|
2024-09-07 23:09:37 +01:00 |
|
Tiago Ribeiro
|
15cc7c8cc9
|
Improved a bit of the pagination
|
2024-09-07 22:48:52 +01:00 |
|
Carlos Mesquita
|
6e4ef249b8
|
Finished refactoring
|
2024-09-07 22:39:14 +01:00 |
|
Carlos Mesquita
|
c2b4bb29d6
|
Refactored /api/users
|
2024-09-07 21:50:29 +01:00 |
|
Carlos Mesquita
|
cab469007b
|
Refactored /api/tickets /api/training
|
2024-09-07 21:25:51 +01:00 |
|
Carlos Mesquita
|
d6782bd86e
|
Refactored /api/paypal, /api/permissions, /api/reset /api/sessions, /api/stats
|
2024-09-07 20:43:55 +01:00 |
|
Tiago Ribeiro
|
6251f8f4db
|
Continued migrating more and more files
|
2024-09-07 18:29:20 +01:00 |
|
Joao Ramos
|
fb9d11f38d
|
ENCOA-200: Added Master Statistical to Corporate
|
2024-09-07 18:19:25 +01:00 |
|
Carlos Mesquita
|
bb8dca69cf
|
Merge conflict
|
2024-09-07 18:09:14 +01:00 |
|
Carlos Mesquita
|
53b31b306d
|
/api/packages refactored, forgot to commit some changes
|
2024-09-07 18:08:03 +01:00 |
|
Tiago Ribeiro
|
d173cdb02a
|
Updated the Grading System
|
2024-09-07 18:00:05 +01:00 |
|
Carlos Mesquita
|
e7ee55d608
|
Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb
|
2024-09-07 17:54:19 +01:00 |
|
Carlos Mesquita
|
7fa4edf37d
|
/api/groups and /api/invites refactored, fixed some inserts/updates in which I didn't include the id
|
2024-09-07 17:54:10 +01:00 |
|
Tiago Ribeiro
|
3be0d158e3
|
Improved the performance of the MasterCorporate
|
2024-09-07 17:34:41 +01:00 |
|
Tiago Ribeiro
|
56f374bbfe
|
Updated the pagination on the useUsers and migrading the grading
|
2024-09-07 16:53:58 +01:00 |
|
Carlos Mesquita
|
417c9176fe
|
/api/exam refactor
|
2024-09-07 16:39:07 +01:00 |
|
Carlos Mesquita
|
e3400e8564
|
/api/evaluate refactor
|
2024-09-07 16:17:24 +01:00 |
|
Carlos Mesquita
|
d680905a87
|
Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb
|
2024-09-07 16:03:32 +01:00 |
|
Carlos Mesquita
|
c07e3f86fb
|
Refactored discounts and replaced my previous commit id queries to use id not _id
|
2024-09-07 16:03:26 +01:00 |
|
Tiago Ribeiro
|
238a25aaeb
|
Updated the make_user to use MongoDB
|
2024-09-07 16:01:03 +01:00 |
|
Carlos Mesquita
|
171231cd21
|
Refactored codes
|
2024-09-07 15:41:09 +01:00 |
|
Carlos Mesquita
|
6ed342bb6f
|
Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb
|
2024-09-07 15:15:17 +01:00 |
|
Carlos Mesquita
|
6f7ef1abef
|
Refactored pages/api/assignments to mongodb
|
2024-09-07 15:13:41 +01:00 |
|
Tiago Ribeiro
|
e33fa00fa3
|
Updated the groups and users
|
2024-09-07 15:13:13 +01:00 |
|
Tiago Ribeiro
|
c0b814081e
|
Updated the register endpoint to use MongoDB
|
2024-09-07 13:58:52 +01:00 |
|
Tiago Ribeiro
|
e8b7c5ff80
|
Started migrating the DB to MongoDB
|
2024-09-07 13:37:08 +01:00 |
|
Carlos Mesquita
|
2bf9afca9c
|
Merge remote-tracking branch 'origin/develop' into feature/training-content
|
2024-09-07 11:38:18 +01:00 |
|
Carlos Mesquita
|
9c41ddee60
|
Training update, most of the styles in the old tips were standardized, before all the styles were hardcoded into the tip, the new tips may still have some hardcoded styles but the vast majority only uses standard html or custom ones that are picked up in FormatTip to attribute styles
|
2024-09-07 11:37:04 +01:00 |
|
Joao Ramos
|
2d0cb8eefb
|
Added level part display on excel and a pseudo sorting
|
2024-09-07 00:14:56 +01:00 |
|
Joao Ramos
|
58448a391f
|
Fixed infinite loop on the dashboards
|
2024-09-06 23:48:18 +01:00 |
|
Tiago Ribeiro
|
f6550e6a36
|
Merge branch 'develop' of bitbucket.org:ecropdev/ielts-ui into develop
|
2024-09-06 17:07:45 +01:00 |
|
Tiago Ribeiro
|
cfe297cc38
|
Continued improving this
|
2024-09-06 17:06:49 +01:00 |
|
Tiago Ribeiro
|
4530e4079f
|
Did the same to all of the dashboards
|
2024-09-06 15:35:26 +01:00 |
|
Tiago Ribeiro
|
de35e1a8b7
|
Updated the MasterCorporate with the improved queries
|
2024-09-06 14:57:23 +01:00 |
|
carlos.mesquita
|
98f2527fed
|
Merged develop into feature/level-file-upload
|
2024-09-06 10:23:32 +00:00 |
|
Carlos Mesquita
|
d8bf10eaea
|
Small bug fix
|
2024-09-06 11:21:35 +01:00 |
|
Tiago Ribeiro
|
f9216637df
|
Extracted the function
|
2024-09-06 10:39:16 +01:00 |
|
Tiago Ribeiro
|
b92a4285c9
|
Removed the user itself
|
2024-09-06 10:12:19 +01:00 |
|
Tiago Ribeiro
|
271ca7069e
|
Updated it so it also appears to teachers
|
2024-09-06 10:10:50 +01:00 |
|
carlos.mesquita
|
08ed8fcb32
|
Merged in feature/level-file-upload (pull request #92)
ENCOA-182, ENCOA-185, ENCOA-177, ENCOA-168, ENCOA-186, ENCOA-176, ENCOA-189, ENCOA-167
Approved-by: Tiago Ribeiro
|
2024-09-06 08:53:29 +00:00 |
|
João Ramos
|
17f678a3ac
|
Merged in ENCOA-131_MasterStatistical (pull request #91)
ENCOA-131 MasterStatistical
Approved-by: Tiago Ribeiro
|
2024-09-06 08:53:07 +00:00 |
|
Carlos Mesquita
|
6bd9816edd
|
Merge remote-tracking branch 'origin/develop' into feature/level-file-upload
|
2024-09-06 09:41:01 +01:00 |
|