Commit Graph

1534 Commits

Author SHA1 Message Date
Jannat Patel
4b049dcf71 fix: styling of course list menu 2023-08-22 19:16:22 +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
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
Jannat Patel
551936e7c4 fix: show logo on certificate only if its present 2023-08-09 16:29:36 +05:30
Jannat Patel
4660240395 fix: certificate share 2023-08-09 14:29:51 +05:30
Jannat Patel
5d0a50242e fix: progress marking for normal content 2023-08-09 12:37:56 +05:30
Jannat Patel
141a778c9a chore: resolved conflicts 2023-08-09 11:49:00 +05:30
Jannat Patel
d83d6cf2d8 Merge pull request #559 from pateljannat/class-revamp
feat: discussions and class dashboard
2023-08-09 11:18:44 +05:30
Jannat Patel
71dc32098e fix: removed unnecessary code 2023-08-09 11:09:17 +05:30
Jannat Patel
6e47b4a941 test: fix discussions test 2023-08-09 10:53:52 +05:30
Jannat Patel
8479e90aeb fix: allow evaluators to access the discussions section 2023-08-09 10:16:48 +05:30
Jannat Patel
24276b779d fix: progress access by students 2023-08-09 10:13:02 +05:30
Jannat Patel
47e254ed9b fix: flow UI and quiz progress 2023-08-07 21:17:23 +05:30
Jannat Patel
9c021ef3b1 feat: razorpay order creation and checkout redirection 2023-08-04 19:37:08 +05:30
Jannat Patel
c284e95dc8 feat: validate razorpay data 2023-08-03 11:46:59 +05:30
Jannat Patel
39663a872c Merge branch 'main' of https://github.com/frappe/lms into paid-courses 2023-08-02 18:50:57 +05:30
Jannat Patel
14cefca735 Merge pull request #579 from pateljannat/fix-gha-dependencies
ci: remove mysql
2023-08-02 18:27:49 +05:30
Jannat Patel
55c56207c2 ci: remove mysql 2023-08-02 18:19:45 +05:30
Jannat Patel
79d9f31db7 feat: paid courses 2023-08-02 18:08:42 +05:30
Jannat Patel
845b906851 feat: redirection from class flow 2023-08-01 18:02:02 +05:30
Jannat Patel
5d2b19cc43 feat: learning flow in class 2023-08-01 10:10:06 +05:30
Jannat Patel
a5bc30f776 Merge pull request #576 from pateljannat/evaluation-duplication
fix: eval request duplicate conditions
2023-07-31 14:49:44 +05:30
Jannat Patel
cce77a475a chore: removed print statement 2023-07-31 14:42:35 +05:30
Jannat Patel
13a26321f5 fix: eval request duplicate conditions 2023-07-31 13:25:12 +05:30