Commit Graph

2343 Commits

Author SHA1 Message Date
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
Jannat Patel
9853ab3fd9 Merge pull request #1024 from frappe/pot_develop_2024-09-20
chore: update POT file
2024-09-23 16:11:57 +05:30
Jannat Patel
dc2bf9f13e feat: category settings 2024-09-23 16:11:17 +05:30
Jannat Patel
7c90ca4040 feat: category in settings 2024-09-20 22:15:59 +05:30
frappe-pr-bot
75a90e1f39 chore: update POT file 2024-09-20 16:04:14 +00:00
Jannat Patel
bc4b17cc3d Merge pull request #1022 from pateljannat/evaluator_name_issue
fix: evaluator name issue
2024-09-19 15:18:05 +05:30
Jannat Patel
8c454a333e fix: evaluator name issue 2024-09-19 14:19:55 +05:30
Jannat Patel
cef4b70182 feat: payment through payments app 2024-09-19 12:46:56 +05:30
Jannat Patel
3cda563583 fix: padding of settings modal 2024-09-18 14:46:29 +05:30
Jannat Patel
545326a02a Merge pull request #1021 from pateljannat/fix-help-video-url
fix: url for lesson help videos
2024-09-18 14:42:33 +05:30
Jannat Patel
14ce5d7e23 fix: url for lesson help videos 2024-09-18 11:49:38 +05:30
Frappe PR Bot
b6422d1046 chore(release): Bumped to Version 2.5.0 v2.5.0 2024-09-18 04:46:24 +00:00
Jannat Patel
7196bbe221 Merge pull request #1019 from pateljannat/issues-34
fix: misc issues
2024-09-18 09:03:33 +05:30
Jannat Patel
bed16c3726 fix: condition to show course addition button 2024-09-18 08:56:35 +05:30
Jannat Patel
d18ca232e3 fix: misc issues 2024-09-18 08:43:16 +05:30
Jannat Patel
d1200d0fa9 fix: profile page empty bio error 2024-09-17 11:48:49 +05:30
Jannat Patel
d1c88b306f Merge pull request #1018 from pateljannat/batch-quiz
feat: quiz page
2024-09-17 10:42:34 +05:30
Jannat Patel
7f2723f9cb Merge pull request #1014 from pateljannat/batch-welcome-email-fix
fix: batch confirmation email trigger
2024-09-17 10:30:00 +05:30
Jannat Patel
8df4bef71a feat: quiz page 2024-09-17 10:25:59 +05:30
Jannat Patel
aa87622606 Merge pull request #1017 from pateljannat/refactor-lesson-editor
refactor: adding quiz and uploading content to a lesson
2024-09-16 19:19:42 +05:30
Jannat Patel
b91339fe28 fix: removed unnecessary files 2024-09-16 18:50:06 +05:30
Jannat Patel
17d4973ab8 test: fixed course creation 2024-09-16 18:41:25 +05:30
Jannat Patel
3c12548420 Merge pull request #1016 from frappe/pot_develop_2024-09-13
chore: update POT file
2024-09-16 16:50:16 +05:30
Jannat Patel
20c10f1645 feat: help guide videos 2024-09-16 16:49:17 +05:30
Jannat Patel
a7843e0e3a refactor: uploading content in lesson 2024-09-16 10:33:16 +05:30
frappe-pr-bot
169ea4385f chore: update POT file 2024-09-13 16:04:09 +00:00
Jannat Patel
9549f3a3ed Merge pull request #1015 from pateljannat/course-completion-funnel
chore: analytics for course completion
2024-09-13 11:37:22 +05:30
Jannat Patel
ba66c2549f chore: renamed lesson_progress to course_progress for analytics 2024-09-13 11:21:59 +05:30