Commit Graph

2079 Commits

Author SHA1 Message Date
Jannat Patel
55170361c1 fix: minor UI issues 2024-06-26 14:25:16 +05:30
Jannat Patel
daa42f146d Merge pull request #894 from pateljannat/issues-22
fix: batch ui
2024-06-26 13:52:30 +05:30
Jannat Patel
67ebd30836 fix: batch ui 2024-06-26 13:10:20 +05:30
Jannat Patel
ac282cebfb Merge pull request #878 from MuhammadKazimSadiq/recent-courses-web-template
Recent courses web template
2024-06-26 11:13:38 +05:30
Jannat Patel
4aea074041 Merge pull request #888 from pateljannat/batch-instructors
feat: instructors in courses and batches
2024-06-26 10:42:01 +05:30
Jannat Patel
888ea5a911 test: type instructor 2024-06-26 10:32:42 +05:30
Jannat Patel
f02b9c09e6 chore: fixed merge conflicts 2024-06-26 09:34:09 +05:30
Jannat Patel
5e91553190 test: instructor when creating course 2024-06-26 09:33:03 +05:30
Md Hussain Nagaria
326c77cdb9 fix: clip progress bar width to 100% (#892)
* fix: course progress bar should not go beyond 100% width

* refactor: progress bar component should include outer body div
2024-06-26 00:29:55 +05:30
Muhammad Kazim
e10af413b2 Merge branch 'develop' into recent-courses-web-template 2024-06-25 19:44:08 +03:30
Md Hussain Nagaria
d4a15ade98 fix: seats left condition (#889) 2024-06-25 21:28:32 +05:30
Jannat Patel
b18a3cb5e1 test: instructor for courses 2024-06-25 19:56:50 +05:30
Jannat Patel
96028c9f42 feat: instructors in courses and batches 2024-06-25 18:43:28 +05:30
Jannat Patel
8625ac048a Merge pull request #877 from nikkothari22/fix-seats-badge
fix: show "Seats Left" instead of "Seat Left" if more than 1 seat is available
2024-06-24 14:35:11 +05:30
Jannat Patel
30934f9eba Merge pull request #884 from pateljannat/issues-21
fix: job page layout
2024-06-24 14:31:22 +05:30
Jannat Patel
8349f47cbe Merge branch 'develop' into fix-seats-badge 2024-06-24 14:30:24 +05:30
Muhammad Kazim
9d3d93443f fix linting issues with pre-commit 2024-06-22 10:46:06 +00:00
Muhammad Kazim
4b6d1c296c Merge branch 'frappe:develop' into recent-courses-web-template 2024-06-22 13:28:51 +03:30
Jannat Patel
0a3a48759f fix: deleted fixture json 2024-06-21 19:23:18 +05:30
Jannat Patel
407bea4ab9 fix: removed badge fixture 2024-06-21 19:17:23 +05:30
Jannat Patel
3ba34f36eb fix: removed meta from eval web form as its not needed 2024-06-21 19:03:22 +05:30
Jannat Patel
8d1c03d4c1 chore: removed unused imports 2024-06-21 18:52:12 +05:30
Jannat Patel
ed739b25e2 fix: job page layout 2024-06-21 18:41:10 +05:30
Nikhil Kothari
807c9b2225 fix: use single span instead of multiple badges 2024-06-21 17:17:36 +05:30
Jannat Patel
7d3dc8df90 Merge pull request #883 from pateljannat/batch-timezone
feat: timezone in batches
2024-06-21 14:23:59 +05:30
Jannat Patel
aafb8948d2 chore: resolved conflicts 2024-06-21 14:05:03 +05:30
Jannat Patel
4f2dd7654c fix: notification template for timezone 2024-06-21 13:17:54 +05:30
Jannat Patel
9c2bebb3d9 feat: timezone in batches 2024-06-21 13:08:58 +05:30
Jannat Patel
e93e82b56c Merge pull request #882 from pateljannat/video-player
feat: video and audio player
2024-06-21 11:44:08 +05:30
Jannat Patel
f783b981e5 feat: added support to embed aparat 2024-06-21 11:38:30 +05:30
Jannat Patel
b5a904354a test: fix lesson content 2024-06-21 11:24:28 +05:30
Jannat Patel
ed7c30057c test: increase wait time when lesson is opened 2024-06-21 10:36:26 +05:30
Jannat Patel
05e8513ad1 feat: video player 2024-06-20 16:46:50 +05:30
Muhammad Kazim
775f8db31e Merge branch 'frappe:develop' into recent-courses-web-template 2024-06-17 00:57:16 +03:30
Muhammad Kazim
4b6d3fe968 web template for recently published courses 2024-06-16 21:26:16 +00:00
Nikhil Kothari
e397295b5e fix: use else-if 2024-06-14 16:30:33 +05:30
Nikhil Kothari
1d16c46003 fix: show "30 seats left" instead of "seat left" in batches 2024-06-14 16:29:58 +05:30
Jannat Patel
3ba8805413 Merge branch 'develop' of https://github.com/frappe/lms into video-player 2024-06-14 10:28:22 +05:30
Jannat Patel
63f4dc0caa Merge pull request #876 from pateljannat/issues-20
fix: misc issues
2024-06-14 10:22:16 +05:30
Jannat Patel
965bdd7890 fix: hide discussions is lesson has quiz 2024-06-14 09:48:22 +05:30
Jannat Patel
a99c41a07b fix: misc changes 2024-06-13 15:34:57 +05:30
Jannat Patel
81feee887c Merge pull request #870 from pateljannat/issues-19
fix: better validation message on course creation
2024-06-12 12:11:47 +05:30
Jannat Patel
77433ebb7c fix: better validation message on course creation 2024-06-12 11:44:14 +05:30
Jannat Patel
d5614322c5 Merge pull request #869 from pateljannat/issues-18
fix: event meeting generation
2024-06-12 10:54:16 +05:30
Jannat Patel
479ff037c6 fix: convert eval string to dict 2024-06-12 10:42:47 +05:30
Jannat Patel
8a74f495e7 fix: event meeting generation 2024-06-12 10:32:57 +05:30
Jannat Patel
231f2cbc14 feat: video player 2024-06-12 10:27:33 +05:30
Jannat Patel
1f466482f8 Merge pull request #867 from pateljannat/issues-17
fix: perf issues
2024-06-07 11:52:41 +05:30
Jannat Patel
103ecef9f4 fix: misc issues 2024-06-07 11:37:46 +05:30
Jannat Patel
2744002390 Merge pull request #866 from pateljannat/issues-16
fix: misc issues
2024-06-06 22:04:47 +05:30