Commit Graph

1906 Commits

Author SHA1 Message Date
Jannat Patel
e2c1f6aa2d Merge pull request #602 from pateljannat/rename-batch-doctype
refactor: renamed batch and membership doctypes
2023-08-26 15:53:56 +05:30
Jannat Patel
e2287cc73c Merge pull request #586 from niraj2477/fix-quiz-submission
fix: Add question in quiz submission
2023-08-26 15:53:22 +05:30
Jannat Patel
c350ce1b60 fix: replaced batch references 2023-08-26 15:44:19 +05:30
Jannat Patel
09dbe0fed7 fix: replaced instances of batch to batch_old 2023-08-26 15:28:03 +05:30
Jannat Patel
12b3d16662 Merge branch 'main' of https://github.com/frappe/lms into rename-batch-doctype 2023-08-25 18:04:28 +05:30
Jannat Patel
1676329eb2 Merge pull request #572 from tahir-zaqout/fix-instructors
fix: course when instructor is not set
2023-08-25 18:02:59 +05:30
Jannat Patel
86434ea320 fix: removed fields array as there is pluck 2023-08-25 17:45:46 +05:30
Jannat Patel
de6b4f7fb2 test: fix batch fieldname 2023-08-25 17:05:55 +05:30
Jannat Patel
6e488cba3e test: fix enrollment tests 2023-08-25 16:44:04 +05:30
Jannat Patel
03a6cc85fe test: enrollment and exercise test fixed 2023-08-25 15:19:29 +05:30
Jannat Patel
b8b32681bf refactor: renamed batch and membership doctypes 2023-08-25 14:46:11 +05:30
Jannat Patel
7f67c6c6d9 Merge pull request #601 from pateljannat/link-class-to-eval-flow
feat: link class in evaluation flow
2023-08-25 10:08:38 +05:30
Jannat Patel
0487b2c987 chore: resolved conflicts 2023-08-24 22:17:45 +05:30
Jannat Patel
d5f10db250 feat: capture gst information 2023-08-24 22:15:55 +05:30
Jannat Patel
74df0f19cf fix: class filter on certification doctypes 2023-08-23 14:52:56 +05:30
Jannat Patel
47c19b4e3d feat: gst fields in class student 2023-08-23 13:00:54 +05:30
Jannat Patel
b197e36ba7 Merge pull request #599 from pateljannat/filter-mobile
fix: styling of course list menu
2023-08-23 10:43:37 +05:30
Jannat Patel
4b049dcf71 fix: styling of course list menu 2023-08-22 19:16:22 +05:30
Jannat Patel
04ed7f412f feat: class billing 2023-08-22 18:34:42 +05:30
Jannat Patel
ac64e59c43 chore: resolved conflicts 2023-08-19 12:26:21 +05:30
Jannat Patel
d5524a8d67 feat: registration information in class student 2023-08-19 12:24:13 +05:30
Jannat Patel
bc350a2661 Merge pull request #595 from pateljannat/revert-registration
revert: class registration
2023-08-18 19:09:19 +05:30
Jannat Patel
575fb623ba revert: class registration 2023-08-18 18:59:02 +05:30
Jannat Patel
b7783659c9 Merge branch 'main' of https://github.com/frappe/lms 2023-08-18 17:39:02 +05:30
Jannat Patel
bddd4743a7 fix: reload course doctype 2023-08-18 17:38:20 +05:30
Jannat Patel
ce8ac15faa Merge pull request #594 from pateljannat/user-validate-image
fix: dont validate user uploaded files
2023-08-18 15:19:57 +05:30
Jannat Patel
46e7c83fae fix: dont validate user uploaded files 2023-08-18 15:13:34 +05:30
Jannat Patel
3dcb55f603 Merge pull request #592 from pateljannat/course-filter
feat: course filters
2023-08-18 13:05:24 +05:30
Jannat Patel
fb3e0832d6 chore: removed unnecessary print statements 2023-08-18 12:49:43 +05:30
Jannat Patel
982d6c9045 fix: popularity filter for enrolled and authored courses 2023-08-18 12:39:19 +05:30
Jannat Patel
a061a89ee7 fix: paid course details on course card template 2023-08-17 22:06:25 +05:30
Jannat Patel
00bb71f714 chore: resolved conflicts 2023-08-17 21:25:52 +05:30
Jannat Patel
e23cfac5a7 Merge pull request #589 from pateljannat/paid-courses
feat: Paid courses
2023-08-17 14:44:29 +05:30
Jannat Patel
ed651959c1 fix: amount information in membership 2023-08-17 14:20:30 +05:30
Jannat Patel
01a1632a5a feat: course filters 2023-08-16 22:01:59 +05:30
Jannat Patel
c2a6697f72 fix: show price on all course cards 2023-08-16 11:51:05 +05:30
Jannat Patel
211775dba5 fix: formatting 2023-08-16 11:00:06 +05:30
Jannat Patel
2ba85ba6a7 feat: paid course from course creation form 2023-08-14 19:30:33 +05:30
Jannat Patel
3b3f1d692f Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-14 09:59:46 +05:30
Ankush Menat
d90bb1e5ea fix: escape arguments 2023-08-13 23:37:16 +05:30
Jannat Patel
0c14a1ab4c feat: payment verification and membership 2023-08-11 19:45:12 +05:30
Jannat Patel
ea27acc683 Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-10 13:33:44 +05:30
14987
b2122e7707 fix: add question in quiz submission 2023-08-10 13:19:33 +05:30
Jannat Patel
9cdc8a50f6 Merge pull request #580 from pateljannat/class-flow
feat: Class flow
2023-08-10 13:14:27 +05:30
Jannat Patel
03620be7bb fix: class schedule date and time validation 2023-08-10 13:00:26 +05:30
Jannat Patel
55296cd9cc fix: show progress on class schedule 2023-08-10 11:51:16 +05:30
Jannat Patel
5fefea1434 Merge branch 'main' of https://github.com/frappe/lms into class-flow 2023-08-09 17:22:44 +05:30
Jannat Patel
66dbe68a15 Merge pull request #583 from pateljannat/certificate-share
fix: Certificate share
2023-08-09 17:10:14 +05:30
Jannat Patel
066e2ddc69 fix: print format value 2023-08-09 17:03:10 +05:30
Jannat Patel
59f08ad4da fix: raise error if certificate is not found in any condition 2023-08-09 16:57:25 +05:30