Commit Graph

Select branches

Hide Pull Requests

ENCOA-131_MasterStatistical

ENCOA-314

ENCOA-316-ENCOA-317

ENCOA-38/add-validity-date-for-discounts

ENCOA-83_MasterStatistical

addedAccess-bugfixes

approval-workflows

bug-fixing-16-jan-24

bugfix/mongo-migration-bugs

develop

faeture/payment-history

feature-generate_questions_page

feature-paypal-simple

feature/99/send-email-on-assignment-creation

feature/ENCOA-42/update-payment-system-paymob

feature/ExamGenRework

feature/corporate-model-implementation

feature/diagnostic-exam

feature/exam-session-persistence

feature/level-file-upload

feature/level-test

feature/payment-record-changes

feature/speaking-gender-selector

feature/training-content

feature/update-permission-ui

fixStudentPerformanceFreeze

improvement-37/writing-evaluation-perfect-answer

main

migration-mongodb

release/async-be

settings-import-users

task/design/dashboard-redesign

vocabulary-grammar

workflow-permissions

Mono Color

• 1950d5f15d Added initial Excel changes Joao Ramos 2024-08-15 14:56:14 +01:00
• e84cc8ddd8 Cleaned up some code Joao Ramos 2024-08-15 13:39:42 +01:00
• cf2fd06d39 Added Icon ofr consolidate highest student Joao Ramos 2024-08-15 10:38:56 +01:00
• b6015b6433 Added any to error to prevent an error Joao Ramos 2024-08-15 10:35:08 +01:00
• fea58a7b40 Added initial implementation for master statistical Joao Ramos 2024-08-15 10:34:31 +01:00
• 13284eab75 Merged in ENCOA-82_Permissions (pull request #69) João Ramos 2024-08-14 19:38:30 +00:00
• dd4e3a4694 Merged develop into ENCOA-82_Permissions Tiago Ribeiro 2024-08-14 19:38:16 +00:00
• eb55e65d91 Solved some issues related to the BatchCreateUser Tiago Ribeiro 2024-08-14 20:36:47 +01:00
• cb75ba6056 Updated permissions to have a key to group them Joao Ramos 2024-08-14 18:44:35 +01:00
• 859d9283a7 Merged in ENCOA-77_GenerationTitle (pull request #64) João Ramos 2024-08-13 21:40:04 +00:00
• 1a3437b333 Merged develop into ENCOA-77_GenerationTitle Tiago Ribeiro 2024-08-13 21:38:56 +00:00
• bbbf17daa0 Merged in ENCOA-79_PaymentRecordsFilters (pull request #61) João Ramos 2024-08-13 21:38:38 +00:00
• ae79aef132 Merge branch 'develop' into ENCOA-79_PaymentRecordsFilters Joao Ramos 2024-08-13 21:32:33 +01:00
• c3e71b4389 Merge branch 'develop' into ENCOA-77_GenerationTitle Joao Ramos 2024-08-13 21:30:50 +01:00
• 2784117862 Updated the MasterCorporate and Corporate pages to allow to have Assignments Tiago Ribeiro 2024-08-13 10:02:40 +01:00
• 8162567e12 Updated the Batch Create User to also have an expiry date Tiago Ribeiro 2024-08-12 19:49:18 +01:00
• 58300e32ff Solved an issue where, for developers, because of the amount of permissions, the cookie was too big, so I separated the permissions logic into a hook Tiago Ribeiro 2024-08-12 19:35:11 +01:00
• cb489bf0ca Merged in feature/training-content (pull request #67) carlos.mesquita 2024-08-12 14:13:28 +00:00
• 91bc91e725 Merged develop into feature/training-content Tiago Ribeiro 2024-08-12 14:12:55 +00:00
• ce086a8b22 Merged in ENCOA-81_CodeListPermissions (pull request #68) João Ramos 2024-08-12 14:12:25 +00:00
• 6e71ee7cb0 ENCOA-81: Fixed issue with the users that each role could create Joao Ramos 2024-08-08 09:17:33 +01:00
• 21e58e3b9c Tooltips for assessment criteria on Writing and Speaking Carlos Mesquita 2024-08-07 13:04:42 +01:00
• b885dd46b5 Merged in ENCOA-80_Permissions (pull request #66) João Ramos 2024-08-07 09:30:04 +00:00
• 0fc2df1070 Added permission to codes Joao Ramos 2024-08-07 10:03:17 +01:00
• cf91f1812d Added group permissions Joao Ramos 2024-08-07 09:36:08 +01:00
• 3289f27cd5 Merged in settings-import-users (pull request #65) Tiago Ribeiro 2024-08-07 06:48:37 +00:00
• 80939d16a5 Merged develop into settings-import-users settings-import-users Tiago Ribeiro 2024-08-07 06:47:59 +00:00
• 11b5490af4 Merged in feature/training-content (pull request #62) carlos.mesquita 2024-08-06 18:46:43 +00:00
• a31070d4a3 Merged in ENCOA-78_ExamList (pull request #63) João Ramos 2024-08-06 18:46:20 +00:00
• 95c3f89911 Added title to the exam generate Joao Ramos 2024-08-06 19:24:43 +01:00
• 2a58e0d33f Added more columns to exam list Joao Ramos 2024-08-06 18:40:49 +01:00
• afe59f5a3a add group creation. mohammedzeglam-pg 2024-08-06 18:03:00 +02:00
• 7fd56357e0 UI changes to Solutions (Writing, Speaking and Interactive Speaking) as requested Carlos Mesquita 2024-08-06 17:02:17 +01:00
• a4a40b9145 Bug fixes to training, added a spinner to record while it loads, made changes to speaking as requested Carlos Mesquita 2024-08-05 21:44:14 +01:00
• 48faee07f6 Added missing fussy search fileds and support for number Joao Ramos 2024-08-05 19:32:53 +01:00
• f0d7d7644b Added date filter Joao Ramos 2024-08-05 19:26:50 +01:00
• 309dfba583 Fixed the training content view Carlos Mesquita 2024-08-05 10:41:11 +01:00
• cf64a91651 Merged in feature/training-content (pull request #60) carlos.mesquita 2024-08-03 14:23:05 +00:00
• 0f47a8af70 Merge branch 'feature/training-content' of https://bitbucket.org/ecropdev/ielts-ui into feature/training-content Carlos Mesquita 2024-08-03 14:33:55 +01:00
• d0310f7c2b Patched the module badges on the training view Carlos Mesquita 2024-08-03 14:32:54 +01:00
• f6a0a391b9 Merged in feature/training-content (pull request #59) carlos.mesquita 2024-08-03 10:13:44 +00:00
• 8dd4dad096 Merged develop into feature/training-content Tiago Ribeiro 2024-08-03 10:13:37 +00:00
• 96baa2a6e0 Dropdown on training view Carlos Mesquita 2024-08-03 11:10:01 +01:00
• 8dd557a29b Merged in feature/training-content (pull request #58) carlos.mesquita 2024-08-03 09:49:00 +00:00
• 4e30eda06f make user verified by default. mzerone 2024-08-03 01:37:41 +02:00
• 12bb124d91 Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/training-content Carlos Mesquita 2024-08-02 15:01:05 +01:00
• a71e6632d6 Hooked training content to backend, did refactors to training components and record.tsx Carlos Mesquita 2024-08-01 20:40:31 +01:00
• 36f518afca add create user in settings. mzerone 2024-08-01 00:41:35 +02:00
• a534126c61 training.tsx still a bit messy, all that is left is to retrieve data from firestore /training and /walkthrough and render it Carlos Mesquita 2024-07-31 20:44:46 +01:00
• 752a46b247 Updated the LevelGeneration to be enabled by default Tiago Ribeiro 2024-07-31 19:15:36 +01:00
• 663b1aae4f Updated the yarn.lock Tiago Ribeiro 2024-07-31 10:42:47 +01:00
• 9b37b60be0 Improved the table feature/update-permission-ui Tiago Ribeiro 2024-07-30 23:22:30 +01:00
• 4347d0cabb Merge branch 'develop' into feature/update-permission-ui Tiago Ribeiro 2024-07-30 23:20:16 +01:00
• 0403773b8e Changed the IDs to now be words and allows the assignment to be like chosen Tiago Ribeiro 2024-07-30 23:18:50 +01:00
• 8d99a6b03c ui updates for permissions. mzerone 2024-07-29 16:16:14 +02:00
• 02320b9484 Tiny issue Tiago Ribeiro 2024-07-28 11:22:46 +01:00
• fb077fd8cc Updated the multiple choice Tiago Ribeiro 2024-07-27 17:43:26 +01:00
• b5a305485f Finalized the reading generation Tiago Ribeiro 2024-07-27 14:55:48 +01:00
• 8f5b27e9ce Updated the FillBlanks to the new format Tiago Ribeiro 2024-07-27 14:38:45 +01:00
• 9ef04b822a Updated the design of the feedback Tiago Ribeiro 2024-07-27 00:04:52 +01:00
• a6160c3cf0 Updated and fixed the level generation Tiago Ribeiro 2024-07-26 23:43:23 +01:00
• 8f6639b7fc Finalized the Level Generation Tiago Ribeiro 2024-07-26 14:09:08 +01:00
• 6a803fe137 Merge branch 'develop' of bitbucket.org:ecropdev/ielts-ui into develop Tiago Ribeiro 2024-07-26 11:51:03 +01:00
• d7f6a4dde7 Undefined was causing record page to crash Carlos Mesquita 2024-07-26 11:00:18 +01:00
• 6058e510de Added the ability to generate custom level exams, still WIP in some parts Tiago Ribeiro 2024-07-26 10:29:36 +01:00
• 7208530879 Merged in feature/ai-detection (pull request #57) carlos.mesquita 2024-07-25 21:01:56 +00:00
• 9b6c545932 Merged develop into feature/ai-detection Tiago Ribeiro 2024-07-25 21:00:40 +00:00
• afb9071758 Merged in ENCOA-56_Permissions (pull request #55) João Ramos 2024-07-25 21:00:28 +00:00
• d50393930e Merged develop into ENCOA-56_Permissions Tiago Ribeiro 2024-07-25 21:00:19 +00:00
• 03e1f2cfa3 Merged in master-corporate (pull request #54) João Ramos 2024-07-25 21:00:04 +00:00
• 877d2f359f Used main branch as base branch in the last time Carlos Mesquita 2024-07-25 16:59:15 +01:00
• 45df9837e7 Added permissions to filter out the user update Joao Ramos 2024-07-25 11:23:11 +01:00
• 923319051c Added code role validation Joao Ramos 2024-07-25 09:43:11 +01:00
• f6b4d6ad52 Initial approach where I replaced all the entries for checkAccess Joao Ramos 2024-07-25 09:13:13 +01:00
• 19d16c9cef Added new permission system Joao Ramos 2024-07-24 18:52:02 +01:00
• daa27e41b3 Merge branch 'develop' into master-corporate Joao Ramos 2024-07-24 09:50:53 +01:00
• 916fa66446 Added linked account Joao Ramos 2024-07-24 09:25:29 +01:00
• 10a3243756 Updated it to work with the new canges Tiago Ribeiro 2024-07-23 14:43:24 +01:00
• a1c7f70329 Solved some small issues Tiago Ribeiro 2024-07-22 23:35:22 +01:00
• bd2efb0ef5 Updated the color of the task response Tiago Ribeiro 2024-07-22 23:30:22 +01:00
• 34065f1f6e Merge branch 'develop' into master-corporate Joao Ramos 2024-07-20 12:38:52 +01:00
• 41873f80d7 ENCOA-66: Payment record not sorting Tiago Ribeiro 2024-07-18 15:45:28 +01:00
• a1b67c017d Merged in ENCOA-57_EditExamsGenerate (pull request #53) João Ramos 2024-07-18 09:32:05 +00:00
• 13fd7e1ee5 Updated Level Generation Joao Ramos 2024-07-17 23:44:53 +01:00
• 4996417218 Fixed sentence header mapping Joao Ramos 2024-07-17 23:00:16 +01:00
• 60d436b5b9 Fixed wrong count Joao Ramos 2024-07-13 17:25:10 +01:00
• 8d39a20267 Fixed broken list Joao Ramos 2024-07-13 17:22:55 +01:00
• 5d46d7e453 Added initial support for "mastercorporate" Joao Ramos 2024-07-13 17:19:42 +01:00
• 15f9fb320d Changed approach on available type selection Joao Ramos 2024-07-09 23:42:16 +01:00
• 494fc9bab6 Changed approach on available type selection Joao Ramos 2024-07-07 16:59:49 +01:00
• 0c5c024098 Added Match Sentences to Reading Generation Joao Ramos 2024-07-07 16:43:14 +01:00
• 903a567805 Fixed error with update part Joao Ramos 2024-07-04 01:35:10 +01:00
• df3929d5e6 Added parse for speaking generation Joao Ramos 2024-07-04 01:34:07 +01:00
• 6d62500596 Added write the blanks for Listening Joao Ramos 2024-07-04 01:23:59 +01:00
• e5e4e87752 Added Listening Multiple Choice Edit Joao Ramos 2024-07-04 01:15:33 +01:00
• 0b3e686f3f Match sentence log Joao Ramos 2024-07-04 00:25:04 +01:00
• 3da87cce60 Added write blanks edit Joao Ramos 2024-07-04 00:19:07 +01:00
• c9daba17e1 Added Fill Blanks Edits + True False Edit Joao Ramos 2024-07-03 11:13:13 +01:00
• 5cfd6d56a6 Merged in bug-fixing-19-Jun-24 (pull request #52) João Ramos 2024-06-25 11:47:24 +00:00
• ec8c06ca94 Filtered out the fields from the UserCard in the list wouldn't have anything to display Joao Ramos 2024-06-24 11:12:16 +01:00