Jannat Patel
484c3d7402
Merge pull request #2128 from frappe/mergify/bp/main/pr-2126
...
fix: permission issue during quiz submission (backport #2126 )
2026-02-25 18:05:27 +05:30
Vaibhav Rathore
08b6a9d091
fix: use str() instead of get_time_str() for time field comparison
...
get_time_str() expects a timedelta but batch start_time is a
datetime.time object, causing AttributeError on batch details page.
2026-02-25 17:05:38 +05:30
Vaibhav Rathore
4be47af3ef
fix: skip conferencing provider validation on batch creation
...
Frappe sets Select field default to the first option ("Zoom") even
when the field isn't in the creation form. Skip validation for new
batches since conferencing is configured after creation.
2026-02-25 16:59:23 +05:30
Jannat Patel
49e989f39e
Merge pull request #2131 from pateljannat/issues-195
...
fix: verify quiz answers on server side
2026-02-25 16:57:05 +05:30
Vaibhav Rathore
898a872232
fix: make conferencing provider optional during batch creation
...
The conferencing_provider Select field defaulted to "Zoom" (first option)
when not explicitly set, causing batch creation to fail with
"Please select a Zoom account for this batch" since no zoom_account
is provided at creation time.
2026-02-25 16:56:02 +05:30
Jannat Patel
e7ce850691
fix: removed trailing comma at the end of permission
2026-02-25 16:45:02 +05:30
Jannat Patel
cb01e17aa7
fix: verify quiz answers on server side
2026-02-25 16:42:55 +05:30
Jannat Patel
d7c5ff7098
Merge pull request #2129 from pateljannat/issues-194
...
fix: sanitize data before creating new course or batch
2026-02-25 14:01:15 +05:30
Jannat Patel
62b5715b98
Merge pull request #2127 from frappe/mergify/bp/main-hotfix/pr-2126
...
fix: permission issue during quiz submission (backport #2126 )
2026-02-25 13:08:14 +05:30
Jannat Patel
593c70affb
chore: resolved conflicts
2026-02-25 13:07:05 +05:30
Jannat Patel
3a1a7db386
chore: resolved conflicts
2026-02-25 13:06:37 +05:30
Jannat Patel
af611b1603
fix: sanitize data before creating new course or batch
2026-02-25 13:03:47 +05:30
Jannat Patel
a5e948bba8
fix: permission issue during quiz submission
...
(cherry picked from commit af5bce9e34 )
# Conflicts:
# lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
2026-02-25 07:21:47 +00:00
Jannat Patel
e63d83beb5
fix: permission issue during quiz submission
...
(cherry picked from commit af5bce9e34 )
2026-02-25 07:21:40 +00:00
Jannat Patel
8fa5c899ff
Merge pull request #2126 from pateljannat/issues-193
...
fix: permission issue during quiz submission
2026-02-25 12:44:28 +05:30
Jannat Patel
af5bce9e34
fix: permission issue during quiz submission
2026-02-25 12:37:09 +05:30
Jannat Patel
1ea8705552
Merge pull request #2125 from frappe/develop
...
chore: merge `develop` into `main-hotfix`
2026-02-25 11:24:11 +05:30
Jannat Patel
61193b71f4
Merge branch 'main-hotfix' into develop
2026-02-25 11:09:48 +05:30
Jannat Patel
2331ddfc67
Merge pull request #2123 from frappe/main-hotfix
...
chore: merge 'main-hotfix' into 'main'
v2.45.0
2026-02-25 10:55:53 +05:30
Jannat Patel
afe9674a6a
Merge pull request #2124 from frappe/mergify/bp/main-hotfix/pr-2121
...
chore: sync translations from crowdin (backport #2121 )
2026-02-25 10:47:30 +05:30
Jannat Patel
5b22ef46c0
chore: resolved conflicts
2026-02-25 10:40:06 +05:30
MochaMind
8f1604e237
chore: Persian translations
...
(cherry picked from commit 63321fe2c8 )
2026-02-25 05:08:21 +00:00
MochaMind
a9f4eb1291
chore: Spanish translations
...
(cherry picked from commit 68848fc642 )
# Conflicts:
# lms/locale/es.po
2026-02-25 05:08:20 +00:00
Jannat Patel
26301c26e9
Merge pull request #2121 from frappe/l10n_develop2
...
chore: sync translations from crowdin
2026-02-25 10:37:32 +05:30
Vaibhav Rathore
559338da59
fix: include conferencing_provider and google_meet_account in batch details API
2026-02-24 23:55:33 +05:30
Vaibhav Rathore
9a7c77c57b
feat: Google Meet integration for Live Classes
...
Add Google Meet as an alternative conferencing provider for Live Classes
in Frappe LMS, alongside the existing Zoom integration. Leverages
Frappe's built-in Google Calendar sync to generate Meet links.
Changes:
- New DocType: LMS Google Meet Settings (account_name, member, calendar)
- Schema changes to LMS Batch (conferencing_provider, google_meet_account)
- Schema changes to LMS Live Class (conferencing_provider, google_meet_account)
- Participant calendar invites via Google Calendar API
- Event update/reschedule sync (on_update hook)
- Event cancellation/deletion sync (on_trash hook)
- Async Meet link handling with user-facing fallback message
- Frontend empty link guard ("Meet link generating...")
- Batch validation for conferencing provider configuration
- Manual attendance marking for Google Meet classes
- Admin UI for managing Google Meet accounts in LMS Settings
- Unit and integration tests
Upstream Issue: frappe/lms#2027
2026-02-24 23:25:27 +05:30
MochaMind
63321fe2c8
chore: Persian translations
2026-02-24 22:48:48 +05:30
MochaMind
68848fc642
chore: Spanish translations
2026-02-24 22:48:29 +05:30
Jannat Patel
aa7ec019bc
Merge pull request #2120 from pateljannat/issues-192
...
fix: misc issues
2026-02-24 18:22:57 +05:30
Jannat Patel
eb33155db2
fix: enqueue progress calculation after validating enrollments
2026-02-24 18:13:02 +05:30
Jannat Patel
3088b14d83
fix: recalculate course progress when lesson is inserted or deleted
2026-02-24 17:40:58 +05:30
Jannat Patel
bf89f3ba2f
fix: show system timezone in certificate request
2026-02-24 13:01:29 +05:30
Jannat Patel
2198adf902
fix: sidebar settings issue if guest access was not allowed
2026-02-24 12:36:46 +05:30
Jannat Patel
c5145c6c24
Merge pull request #2119 from pateljannat/issues-191
...
fix: misc issues
2026-02-24 12:17:41 +05:30
Jannat Patel
499bcd5281
chore: resolved conflicts
2026-02-24 12:05:44 +05:30
Jannat Patel
dc4bbdaa55
Merge pull request #2116 from raizasafeel/fix/codesandbox-embed
...
fix(lesson): render codesandbox
2026-02-24 12:02:52 +05:30
Jannat Patel
bf19ebd3a8
fix: assignment submission issue
2026-02-24 12:02:10 +05:30
Jannat Patel
fa7e59b4ad
Merge pull request #2118 from frappe/mergify/bp/main-hotfix/pr-2117
...
chore: capture more events for analytics (backport #2117 )
2026-02-23 16:59:02 +05:30
Jannat Patel
5fcd3ddabe
revert: removed new batch modal changes
2026-02-23 16:45:37 +05:30
Jannat Patel
a9dd43d0ea
chore: resolved conflicts
2026-02-23 16:44:04 +05:30
Jannat Patel
22e005f19c
chore: capture more events for analytics
...
(cherry picked from commit b3c8fbd833 )
# Conflicts:
# frontend/src/pages/Batches/components/NewBatchModal.vue
# lms/lms/doctype/lms_course_review/lms_course_review.json
2026-02-23 11:11:44 +00:00
Jannat Patel
5a6a7ff646
Merge pull request #2117 from pateljannat/issues-189
...
chore: capture more events for analytics
2026-02-23 16:41:23 +05:30
Jannat Patel
b3c8fbd833
chore: capture more events for analytics
2026-02-23 16:31:58 +05:30
Jannat Patel
f828c76a0f
Merge pull request #2115 from pateljannat/issues-188
...
fix: misc issues
2026-02-23 15:13:02 +05:30
raizasafeel
2634a4e316
fix(lesson): render codesandbox properly
2026-02-23 15:12:08 +05:30
Jannat Patel
fb0517caa0
fix: show only instructor tab for admins on home page
2026-02-23 14:54:54 +05:30
Jannat Patel
90151be166
fix: updated app name in workspace and desktop
2026-02-23 12:35:13 +05:30
Jannat Patel
9b0a7f5fa5
Merge pull request #2112 from pateljannat/issues-187
...
fix: lesson progress issue
2026-02-23 12:03:30 +05:30
Jannat Patel
aa93375e6c
Merge pull request #2110 from frappe/mergify/bp/main-hotfix/pr-2109
...
fix: check permission of session user during batch enrollment (backport #2109 )
2026-02-23 11:49:25 +05:30
Jannat Patel
e8edf33be6
fix: lesson progress issue
2026-02-23 11:49:06 +05:30