Commit Graph

3470 Commits

Author SHA1 Message Date
Frappe PR Bot 736d79b8c9 chore(release): Bumped to Version 2.8.0 v2.8.0 2024-10-09 06:04:56 +00:00
Jannat Patel 98c0bd5f3e Merge pull request #1042 from frappe/pot_develop_2024-10-04
chore: update POT file
2024-10-09 11:34:01 +05:30
Jannat Patel 8b1d9bb5a9 fix: create order for razorpay 2024-10-09 11:31:31 +05:30
Jannat Patel 289a0f9122 Merge pull request #1046 from pateljannat/issues-38
fix: quiz columns
2024-10-08 16:27:04 +05:30
Jannat Patel 3cd08c80c8 fix: reduced with of marks column 2024-10-08 16:09:21 +05:30
Jannat Patel 3d82c36250 fix: quiz columns 2024-10-08 16:03:37 +05:30
Jannat Patel 9b9af0215a Merge pull request #1045 from pateljannat/issues-37
fix: using google docs viewer to render pdf
2024-10-08 12:37:19 +05:30
Jannat Patel 2e4cf02737 fix: using google docs viewer to render pdf 2024-10-08 12:00:51 +05:30
Jannat Patel 438e9e1c47 Merge pull request #1044 from pateljannat/open-ended-questions
feat: open ended questions
2024-10-08 10:37:44 +05:30
Jannat Patel 36ded70eef fix: only allow instructor and moderator on submission page 2024-10-08 10:21:45 +05:30
Jannat Patel ba78a15a1f fix: ui test button label 2024-10-08 10:14:04 +05:30
Jannat Patel 93061194bb fix: error toast when saving marks 2024-10-08 10:13:07 +05:30
Jannat Patel 6d41e4e552 feat: open ended questions 2024-10-07 21:18:42 +05:30
frappe-pr-bot 3b06968d0a chore: update POT file 2024-10-04 16:04:32 +00:00
Frappe PR Bot fc81f1aa26 chore(release): Bumped to Version 2.7.0 v2.7.0 2024-10-02 06:53:07 +00:00
Jannat Patel 59d8848125 Merge pull request #1035 from pateljannat/payments
feat: payments app integration
2024-10-02 12:22:00 +05:30
Jannat Patel a067695f71 fix: removed help article from course lesson 2024-10-01 15:43:45 +05:30
Jannat Patel be870e8145 fix: payment gateway fields 2024-10-01 15:17:17 +05:30
Jannat Patel 8a17dca351 fix: minor ui changes 2024-10-01 10:43:37 +05:30
Jannat Patel 1c9f636ad1 Merge pull request #1032 from frappe/pot_develop_2024-09-27
chore: update POT file
2024-10-01 09:42:57 +05:30
Jannat Patel 008cc66cdd chore: refactor payment settings 2024-09-30 18:30:53 +05:30
Jannat Patel b6bf9c0032 Merge branch 'develop' of https://github.com/frappe/lms into payments 2024-09-30 10:16:52 +05:30
Jannat Patel d295898674 Merge pull request #1033 from pateljannat/issues-35
fix: misc UI fixes
2024-09-27 22:15:43 +05:30
frappe-pr-bot 4fdca4691a chore: update POT file 2024-09-27 16:04:07 +00:00
Jannat Patel 7c055af496 fix: telemetry capture issue 2024-09-27 21:32:46 +05:30
Jannat Patel 60a3da283e refactor: billing page ui 2024-09-27 14:14:03 +05:30
Jannat Patel 576258ec6e fix: pass options to setting fields 2024-09-27 07:05:16 +05:30
Jannat Patel 01120fbc48 chore: resolved conflicts 2024-09-27 06:24:12 +05:30
Jannat Patel ad07f883b5 fix: misc UI fixes 2024-09-27 06:19:38 +05:30
Jannat Patel bb9b179e05 Merge pull request #1031 from pateljannat/brand-settings
feat:  brand settings
2024-09-26 14:01:19 +05:30
Jannat Patel 11a9bff57d fix: dirty form for branding section 2024-09-26 12:58:00 +05:30
Jannat Patel e18f0c9dad feat: brand settings 2024-09-26 12:09:58 +05:30
Jannat Patel 41ad3d00de Merge pull request #1030 from pateljannat/fix-evaluation-issue
fix: evaluation error message issue
2024-09-25 11:29:42 +05:30
Frappe PR Bot b74c1670ca chore(release): Bumped to Version 2.6.0 v2.6.0 2024-09-25 05:47:45 +00:00
Jannat Patel 33c76e842f fix: evaluation error message issue 2024-09-25 11:10:26 +05:30
Jannat Patel 35a7cce283 feat: payment gateway settings 2024-09-25 10:50:53 +05:30
Jannat Patel e0f569c382 feat: payment flow with payments app 2024-09-24 18:14:34 +05:30
Jannat Patel d8ab88be28 Merge branch 'develop' of https://github.com/frappe/lms into payments 2024-09-24 14:14:49 +05:30
Jannat Patel 04552bdef6 Merge pull request #1025 from pateljannat/categories-in-courses
feat: course categories
2024-09-24 12:55:41 +05:30
Jannat Patel ad5bf89b35 test: enter instructor value 2024-09-24 12:32:07 +05:30
Jannat Patel 88b38dfd83 test: category test in course form in UI 2024-09-24 12:22:34 +05:30
Jannat Patel 75e9ca395f chore: removed unnecessary custom fields 2024-09-24 10:59:27 +05:30
Jannat Patel 6fb206cc4e feat: updating category from settings 2024-09-24 10:33:23 +05:30
Jannat Patel 62cb198492 Merge branch 'develop' of https://github.com/frappe/lms into categories-in-courses 2024-09-23 19:23:49 +05:30
Jannat Patel 9609329f01 Merge pull request #1028 from pateljannat/fix-signup-customisations
fix: signup conditions
2024-09-23 19:12:29 +05:30
Jannat Patel c93808af94 fix: signup conditions 2024-09-23 18:41:35 +05:30
Jannat Patel 58866260ec Merge branch 'develop' of https://github.com/frappe/lms into categories-in-courses 2024-09-23 18:39:19 +05:30
Jannat Patel e6157ff411 Merge pull request #1027 from pateljannat/refactor-signup-customisations
refactor: signup customisations
2024-09-23 18:23:04 +05:30
Jannat Patel 8cca8920ee chore: removed unnecessary file 2024-09-23 18:07:08 +05:30
Jannat Patel ab039dbd46 refactor: signup customisations 2024-09-23 18:04:36 +05:30