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

• 44454d1e05 Changed corporate from user.name to user.companyName Company name is now updateable Joao Ramos 2023-12-14 17:57:39 +00:00
• a2b9ba17a7 Replaced 'Agent' with 'Country Manager' on role display Joao Ramos 2023-12-14 17:38:24 +00:00
• 6f61fe1564 Comission is now hidden from everyone apart from admins Joao Ramos 2023-12-14 17:34:52 +00:00
• 73d7ddc4af Profile screen was crashing Joao Ramos 2023-12-14 17:34:12 +00:00
• 263f4afa82 Merged develop into feature-paymentAssetManagement João Ramos 2023-12-14 17:21:24 +00:00
• 45cf2dc279 Added a number asset to limit to a specific number of decimal cases if needed Joao Ramos 2023-12-14 17:20:36 +00:00
• 786a425d85 Merged in feature-displayRole (pull request #6) João Ramos 2023-12-14 09:58:06 +00:00
• d57223bd01 Added a Fixed decimal point for the payment records Tiago Ribeiro 2023-12-14 09:52:47 +00:00
• fbc2cff3f1 Minor identation changes Joao Ramos 2023-12-13 23:58:48 +00:00
• 9ad4f077d1 Added user type to navbar Joao Ramos 2023-12-13 23:57:32 +00:00
• e2b6061310 Merge branch 'develop' into feature-paymentAssetManagement Joao Ramos 2023-12-13 23:43:52 +00:00
• b77e97a9d2 Changed icon used for replacing files Joao Ramos 2023-12-13 23:39:22 +00:00
• 67925c8a9e Merged in feature-newPaymentOnUserUpdate (pull request #3) João Ramos 2023-12-13 23:33:30 +00:00
• 020ecff29c Implemented file storage handling for Corporate Transfer and Comission Transfer Joao Ramos 2023-12-13 23:29:14 +00:00
• 964660ed5d Merged develop into feature-newPaymentOnUserUpdate Tiago Ribeiro 2023-12-13 22:01:43 +00:00
• 1390af62ab Merged in feature-levelScoringTiers (pull request #4) João Ramos 2023-12-13 22:01:07 +00:00
• 15947f942c Fixed issue with payment records on update Joao Ramos 2023-12-13 17:08:26 +00:00
• 7b3c3d15db Changed approach to display level for Level Testing Joao Ramos 2023-12-13 00:11:48 +00:00
• 1cff6fe242 Temporary fix on date/data payment Joao Ramos 2023-12-12 22:48:38 +00:00
• 4cbd045502 Added comission to user card and updated user update to insert a new payment entry Joao Ramos 2023-12-12 22:44:33 +00:00
• 21b612eaa4 Removed references to Referred corporated Joao Ramos 2023-12-11 22:34:42 +00:00
• ef18e304a1 - Created a package list for student packages; - Updated the group creation wizard to work as a modal; Tiago Ribeiro 2023-12-11 13:43:23 +00:00
• 8e4223a9e7 Slight tweak on the sidebar logout Tiago Ribeiro 2023-12-09 15:44:02 +00:00
• 7d696735ba Improved a bit of the UI for the admin dashboard Tiago Ribeiro 2023-12-09 15:35:56 +00:00
• e0ecc5be05 Merge branch 'develop' into improvement-37/writing-evaluation-perfect-answer improvement-37/writing-evaluation-perfect-answer Tiago Ribeiro 2023-12-09 14:47:06 +00:00
• 77af0b3495 Merged in feature-multiplerandomexams (pull request #1) João Ramos 2023-12-09 14:43:48 +00:00
• e2e38284a7 Uncommented a section Tiago Ribeiro 2023-12-09 14:39:03 +00:00
• ccd2560451 Merged develop into feature-multiplerandomexams Tiago Ribeiro 2023-12-09 14:37:34 +00:00
• 390658f2b0 Merged in feature-removeCompanyReferences (pull request #2) João Ramos 2023-12-09 14:28:30 +00:00
• 450a4e9fe3 Changed Comercial labels to Corporate Joao Ramos 2023-12-08 15:43:19 +00:00
• dfbbf0456d Revert "Changed Comercial labels to Corporate" Joao Ramos 2023-12-08 14:55:16 +00:00
• d46f92edb2 Added Referenced corporate expiring in 1 month Joao Ramos 2023-12-07 23:42:04 +00:00
• 26c4368f31 Minor improvement on reusability of filter function Joao Ramos 2023-12-07 23:34:31 +00:00
• ec56a5426b Added Inactive Referred corporate Joao Ramos 2023-12-07 23:31:16 +00:00
• fe32584ff9 Add Inactive Country manager Joao Ramos 2023-12-07 23:23:39 +00:00
• db7762c6e2 Replaced Teacher labels Joao Ramos 2023-12-07 23:20:19 +00:00
• e70e26f84c Updated checkbox string Joao Ramos 2023-12-07 23:17:23 +00:00
• 7dc9d568d1 Replaced Teachers Icon Joao Ramos 2023-12-07 23:13:42 +00:00
• 0049ab272b Added dynamic generation of exams as an option Joao Ramos 2023-12-07 23:07:35 +00:00
• f48885bba6 Updatd UI to display the unique tests for each user in an assignment Joao Ramos 2023-12-07 18:23:44 +00:00
• 5eaa0ac269 Assignments now generate unique list of exams for each user Joao Ramos 2023-12-07 18:23:00 +00:00
• f7af21878e Separate get exam bussiness logic into a backend asset Joao Ramos 2023-12-07 18:20:11 +00:00
• 9d4071d4cd Added debug settings for vscoe Joao Ramos 2023-12-07 18:19:01 +00:00
• 6f5dd86cd1 Updated so the new payment prefills with all of the corporate's payment information Tiago Ribeiro 2023-12-07 16:36:57 +00:00
• 8b9537b272 Merge branch 'develop' into improvement-37/writing-evaluation-perfect-answer Tiago Ribeiro 2023-12-06 16:43:14 +00:00
• a526e76c70 Added a feature to allow a user to filter the payment record Tiago Ribeiro 2023-12-06 16:41:11 +00:00
• 62b2f477f4 Replaced Corporate Icon on Agent Dashboard Joao Ramos 2023-12-06 15:54:49 +00:00
• f36384fdb4 Replaced Corporate Icon on Admin dashboard Joao Ramos 2023-12-06 15:43:44 +00:00
• 9c8d7988c5 Changed Comercial labels to Corporate Joao Ramos 2023-12-06 15:16:48 +00:00
• 18f163768c Made it so, when a user registers with an eCrop e-mail, they get the role of a developer Tiago Ribeiro 2023-12-06 15:15:50 +00:00
• 72083439af Updated Writing and Speaking to have a tab system for the evaluation vs the "perfect answer" Tiago Ribeiro 2023-12-06 14:48:54 +00:00
• 523149327b Turned the name into a fallback when there is no corporate name Tiago Ribeiro 2023-12-06 11:31:56 +00:00
• 58c18133ec Finished up the modal to create a payment and added the page to the sidebar faeture/payment-history Tiago Ribeiro 2023-12-05 23:41:55 +00:00
• 03520b650b Merge branch 'develop' into faeture/payment-history Tiago Ribeiro 2023-12-05 16:36:16 +00:00
• 556884058b Fixed a bug where the user was not being saved when the expiry date is disabled Tiago Ribeiro 2023-12-05 16:35:40 +00:00
• 73b0d5d41d Continued creating the payment page Tiago Ribeiro 2023-12-05 16:27:18 +00:00
• 7c589327f7 Merge branch 'develop' into faeture/payment-history Tiago Ribeiro 2023-12-04 16:01:30 +00:00
• 5c8867555d Added the option to view both the teachers and students of a corporate as well as the corporate of a student Tiago Ribeiro 2023-12-03 00:13:50 +00:00
• 36be5267a2 Set the Part 4 as undefined as well Tiago Ribeiro 2023-11-30 16:52:45 +00:00
• 4ebfd49cb9 Merge branch 'develop' into faeture/payment-history Tiago Ribeiro 2023-11-30 15:52:16 +00:00
• 96fe83de14 Added the Speaking generation to the project, still WIP Tiago Ribeiro 2023-11-30 15:50:24 +00:00
• 1746db3752 Disabled Diagnostics test for all users except students Tiago Ribeiro 2023-11-30 10:36:15 +00:00
• 58b4883236 Updated the types of exercises for the Listening Generation Tiago Ribeiro 2023-11-29 20:52:08 +00:00
• a3864eb7d3 Added sound effects to the exam generation Tiago Ribeiro 2023-11-29 20:26:48 +00:00
• 1f0e5f4a08 Added the ability to generate Listening exams as well Tiago Ribeiro 2023-11-29 17:19:47 +00:00
• c90234cefc Changed from employment to position for Corporate accounts Tiago Ribeiro 2023-11-28 08:21:00 +00:00
• f354a4f4fe Solved an oopsie Tiago Ribeiro 2023-11-27 23:09:37 +00:00
• 7e0c071eee Changed to Number of users Tiago Ribeiro 2023-11-27 23:07:40 +00:00
• 9bed726062 Created a list of payments Tiago Ribeiro 2023-11-27 22:27:51 +00:00
• 3878d4761e Made it so the listing of a corporate account shows the name of the corporate instead of the person Tiago Ribeiro 2023-11-27 13:07:33 +00:00
• 81f5af5629 Added more information for the Agent User Tiago Ribeiro 2023-11-27 13:02:19 +00:00
• 5f76e430af Extracted the user types Tiago Ribeiro 2023-11-27 11:35:04 +00:00
• facac33a89 More housekeeping Tiago Ribeiro 2023-11-27 11:22:41 +00:00
• f36c63f1b2 Added a trim Tiago Ribeiro 2023-11-27 11:06:05 +00:00
• b1f07b877c Added the type to the profile page Tiago Ribeiro 2023-11-27 10:39:43 +00:00
• 70611305a7 Changed the defaultAvatar Tiago Ribeiro 2023-11-27 10:32:54 +00:00
• fdedc2c5d3 Changed the way the settings is viewable Tiago Ribeiro 2023-11-27 10:32:02 +00:00
• 75875b49e6 Removed access to upload/add users from the teachers Tiago Ribeiro 2023-11-27 10:23:42 +00:00
• 37e52886b5 Merge branch 'main' into develop Tiago Ribeiro 2023-11-27 08:48:52 +00:00
• a5dfe69220 Removed an unused firebase config variable Tiago Ribeiro 2023-11-27 08:48:15 +00:00
• 1c36c7f1e1 Improved a slight detail Tiago Ribeiro 2023-11-26 23:21:45 +00:00
• 9de39485de Improved the way the PayPal integration works Tiago Ribeiro 2023-11-26 23:16:26 +00:00
• 0fe2e0d393 Merge branch 'develop' into feature/paypal-integration Tiago Ribeiro 2023-11-26 23:00:17 +00:00
• dbb5e131fc Removed the previous stuff Tiago Ribeiro 2023-11-26 22:34:59 +00:00
• ebda1e1717 And another test Tiago Ribeiro 2023-11-26 22:34:35 +00:00
• 8cbec131fe Adding it to the build as well Tiago Ribeiro 2023-11-26 22:13:02 +00:00
• 472d4a3331 Let's try this one out now Tiago Ribeiro 2023-11-26 21:49:39 +00:00
• c2f83d996a Testing something out Tiago Ribeiro 2023-11-26 21:15:09 +00:00
• 43bd6b24c5 Reverted a change Tiago Ribeiro 2023-11-26 15:47:37 +00:00
• ca89261e10 Made it so the admin and agent should also be able to edit the amount each corporate should pay Tiago Ribeiro 2023-11-26 15:15:58 +00:00
• a9bbbe8b52 Turned the code in the register optional Tiago Ribeiro 2023-11-26 13:59:14 +00:00
• fa544bf4e8 Enabled payment for Corporate along with increasing every single one of their students/teachers expiry date as well Tiago Ribeiro 2023-11-26 11:01:27 +00:00
• 7e91a989b3 Added packages for students to be able to purchase Tiago Ribeiro 2023-11-26 10:08:57 +00:00
• c312260721 Started working with PayPal Tiago Ribeiro 2023-11-24 16:02:55 +00:00
• 23f2bace5d Added the ability to generate Level exams Tiago Ribeiro 2023-11-24 00:57:25 +00:00
• 7e2f1fcf9d Merge branch 'develop' into feature/exam-generation Tiago Ribeiro 2023-11-21 19:45:30 +00:00
• 6e420a8a82 Created a dashboard for the Agent Tiago Ribeiro 2023-11-21 18:01:45 +00:00
• cd81547022 Created a dashboard of the Agent Tiago Ribeiro 2023-11-21 13:59:36 +00:00
• a2baedb80c Improvement the creation of Agents Tiago Ribeiro 2023-11-21 13:37:29 +00:00
• 8072cefbe6 Added the ability to create an agent using the CodeGenerator Tiago Ribeiro 2023-11-21 13:24:07 +00:00