Commit Graph

5841 Commits

Author SHA1 Message Date
Jannat Patel ef574047fe Merge pull request #2174 from frappe/develop
chore: merge `develop` into `main-hotfix`
2026-03-09 17:26:18 +05:30
Jannat Patel a7eaaeda95 Merge pull request #2159 from pateljannat/demo-data
feat: demo data
2026-03-09 16:47:08 +05:30
Jannat Patel 82d9ea7efc fix: delete demo quiz and users when deleting demo data 2026-03-09 16:37:21 +05:30
Jannat Patel a6da65ab99 fix: dont capture progress of demo course for analytics 2026-03-09 16:22:21 +05:30
Jannat Patel ad76fac579 Merge pull request #2172 from frappe/pot_develop_2026-03-09
chore: update POT file
2026-03-09 14:10:41 +05:30
frappe-pr-bot 0fb4e0bc41 chore: update POT file 2026-03-09 08:28:54 +00:00
Jannat Patel 68d69d5ccd Merge pull request #2171 from pateljannat/issues-206
fix: misc issues
2026-03-09 12:20:28 +05:30
Jannat Patel f11059524f fix: lms dynamic path fetching 2026-03-09 11:54:16 +05:30
Jannat Patel 735a3f4b00 fix: misc issues 2026-03-09 11:34:28 +05:30
Jannat Patel 0a587e5598 Merge pull request #2169 from frappe/l10n_develop2
chore: sync translations from crowdin
2026-03-09 10:51:24 +05:30
Jannat Patel cb273685a7 test: click the div of the test course and not the first card 2026-03-09 10:50:46 +05:30
MochaMind daacbc7faf chore: Russian translations 2026-03-07 06:03:52 +05:30
Jannat Patel 711d89b603 fix: exclude demo course count before showing persona 2026-03-06 17:51:40 +05:30
Jannat Patel 3889893b2f Merge branch 'develop' of https://github.com/frappe/lms into demo-data 2026-03-06 17:44:53 +05:30
Jannat Patel 7cfae5401e Merge pull request #2168 from raizasafeel/fix/persona
fix(persona): redirection route and skip button
2026-03-06 17:44:42 +05:30
Jannat Patel 71f3aca623 Merge pull request #2167 from raizasafeel/fix/payment
fix: use backend field metadata for billing and transaction forms
2026-03-06 17:42:39 +05:30
Jannat Patel 8c54d77740 test(ui): find course with the test title instead of checking the first course card 2026-03-06 17:22:12 +05:30
Jannat Patel 2e0f8e91af fix: pluck name when creating instructor for demo 2026-03-06 17:08:42 +05:30
Jannat Patel 7c20b9c728 ci: get payments app in ui tests 2026-03-06 17:00:03 +05:30
Jannat Patel 2941c4724f ci(revert): don't get payments app 2026-03-06 12:10:34 +05:30
Jannat Patel dcdffc0aac ci: get payments app before installing lms 2026-03-05 21:51:59 +05:30
Jannat Patel 607103e40e feat: demo review and course progress 2026-03-05 21:41:34 +05:30
raizasafeel 8d3485742b revert: 'refactor(persona): made persona labels/options smaller and simpler' 2026-03-05 15:27:02 +05:30
raizasafeel f24b0fd22b fix(persona): skip/continue button redirects to Home page 2026-03-05 15:20:59 +05:30
Raizaaa 3731826ffd Merge branch 'frappe:develop' into fix/persona 2026-03-05 13:49:12 +05:30
raizasafeel 865634ce82 fix(persona): skip button now successfully redirects to courses 2026-03-05 13:45:16 +05:30
raizasafeel 9923b702e0 refactor(persona): made persona labels/options smaller and simpler 2026-03-05 13:37:54 +05:30
raizasafeel 49f4c878d6 fix(persona): moved to homepage from courses page 2026-03-05 13:30:22 +05:30
Jannat Patel 69e2d628d9 Merge pull request #2165 from frappe/develop
merge `develop` into `main-hotifx`
2026-03-05 10:30:31 +05:30
Raizaaa 112cc3ac9d Merge branch 'frappe:develop' into fix/payment 2026-03-05 02:07:41 +05:30
raizasafeel 4a5f16e1bc fix(settings): transaction button now redirects successfully to batch/course 2026-03-05 02:05:21 +05:30
raizasafeel a893c405d1 fix: replace hardcoded meta fields with validation from backend 2026-03-05 02:05:00 +05:30
raizasafeel 5683fd5d7a fix: add get_field_meta function to get doctype field metadata 2026-03-05 02:03:24 +05:30
Jannat Patel f1014e7452 Merge branch 'develop' of https://github.com/frappe/lms into demo-data 2026-03-04 20:53:22 +05:30
Jannat Patel 82f0bb40ef Merge branch 'main-hotfix' into develop 2026-03-04 20:49:45 +05:30
Jannat Patel 71ff6e01d6 Merge pull request #2164 from pateljannat/issues-205
fix: misc issues
2026-03-04 20:43:56 +05:30
Jannat Patel 701814060d fix: delete event after deleting the live class 2026-03-04 20:35:51 +05:30
Jannat Patel 292b48fbac fix: do not link live class to event as event is already linked to live class 2026-03-04 18:08:55 +05:30
Jannat Patel 2e3baff401 refactor: live class controllers for better code reusability 2026-03-04 16:59:32 +05:30
Jannat Patel 7e26bb277f fix: misc ui issues 2026-03-04 16:58:53 +05:30
Jannat Patel 22fb96a00f Merge pull request #2163 from pateljannat/issues-204
fix: assignment conditions for save button visibility
2026-03-04 11:09:37 +05:30
Jannat Patel 8752f8038a Merge pull request #2156 from raizasafeel/fix/payment-gateway
fix(payment gateway): add delete functionality and field details
2026-03-04 11:01:38 +05:30
Jannat Patel c5bb852227 Merge pull request #2122 from ColoredCow/feature/google-meet
feat: Google Meet integration for Live Classes
2026-03-04 11:00:13 +05:30
Jannat Patel 8d8452f8a3 fix: assignment conditions for save button visibility 2026-03-04 10:44:39 +05:30
Jannat Patel c77fdf55b3 Merge branch 'main' into main-hotfix 2026-03-04 10:22:29 +05:30
Jannat Patel c509da8497 Merge pull request #2160 from frappe/l10n_develop2
chore: sync translations from crowdin
2026-03-04 10:21:32 +05:30
MochaMind d5bc012c21 chore: Swedish translations 2026-03-04 00:17:20 +05:30
MochaMind 610ec89670 chore: Spanish translations 2026-03-04 00:17:06 +05:30
Vaibhav Rathore a29e1a58a4 fix: resolve server test failures for Google Meet integration
- Mock get_google_calendar_object in live class tests to prevent real
  Google API calls in CI (no OAuth tokens available)
- Fix on_trash to clear event link before deleting Event to avoid
  LinkExistsError
- Fix test query to avoid PostgreSQL-incompatible integer filter
- Add Google Settings setup to Google Meet Settings integration tests
2026-03-03 17:34:34 +05:30
Vaibhav Rathore f0d35ec1d1 fix: enable Google API in test setup to fix CI server tests
Google Calendar validation requires Google API to be enabled in Google
Settings. Without this, all LMS Live Class tests fail in CI with
"Enable Google API in Google Settings" error.
2026-03-03 15:56:34 +05:30