MIDNIGHT/frappe-lms
2
0
Fork 0
mirror of https://github.com/frappe/lms.git synced 2026-05-02 13:39:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1921 from frappe/develop

Browse Source 
chore: merge 'develop' into 'main'
This commit is contained in:
Jannat Patel
2025-12-17 11:01:30 +05:30
committed by GitHub
parent 52fb5e2ad8 4345ff18bd
commit a7bbb7f150
39 changed files with 3066 additions and 7964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/CourseCard.vue
+2 -3
View File
@@ -152,11 +152,10 @@ const props = defineProps({
})
const getGradientColor = () => {
let theme =
localStorage.getItem('theme') == 'light' ? 'lightMode' : 'darkMode'
let theme = localStorage.getItem('theme') == 'dark' ? 'darkMode' : 'lightMode'
let color = props.course.card_gradient?.toLowerCase() || 'blue'
let colorMap = colors[theme][color]
return `linear-gradient(to top right, black, ${colorMap[200]})`
return `linear-gradient(to top right, black, ${colorMap[400]})`
}
</script>
<style>
frontend/src/pages/Batches.vue
+1 -1
View File
@@ -90,7 +90,7 @@
v-model="currentCategory"
:options="categories"
:placeholder="__('Category')"
@change="updateBatches()"
@update:modelValue="updateBatches()"
/>
</div>
</div>
frontend/src/pages/CertifiedParticipants.vue
+1 -1
View File
@@ -33,7 +33,7 @@
v-model="currentCategory"
:options="categories.data"
:placeholder="__('Category')"
@change="updateParticipants()"
@update:modelValue="updateParticipants()"
/>
</div>
</div>
frontend/src/pages/Courses.vue
+1 -1
View File
@@ -75,7 +75,7 @@
v-model="currentCategory"
:options="categories"
:placeholder="__('Category')"
@change="updateCourses()"
@update:modelValue="updateCourses()"
/>
</div>
</div>
frontend/src/pages/Home/Home.vue
+1 -1
View File
@@ -74,7 +74,7 @@ const isAdmin = computed(() => {
})
const myLiveClasses = createResource({
url: 'lms.lms.utils.get_my_live_classes',
url: 'lms.lms.api.get_my_live_classes',
auto: !isAdmin.value ? true : false,
})
frontend/src/pages/Lesson.vue
+2 -1
View File
@@ -319,7 +319,7 @@
</div>
</div>
<InlineLessonMenu
v-if="lesson.data"
v-if="lesson.data?.name"
v-model="showInlineMenu"
:lesson="lesson.data?.name"
v-model:notes="notes"
@@ -731,6 +731,7 @@ const updateVideoTime = (video) => {
}
const startTimer = () => {
if (!lesson.data?.membership) return
let timerInterval = setInterval(() => {
timer.value++
if (timer.value == 30) {
frontend/vite.config.js
+1 -1
View File
@@ -65,6 +65,6 @@ export default defineConfig(({ mode }) => ({
'highlight.js',
'plyr',
],
//exclude: mode === 'production' ? [] : ['frappe-ui'],
exclude: mode === 'production' ? [] : ['frappe-ui'],
},
}))
frontend/yarn.lock
+35 -35
View File
@@ -940,9 +940,9 @@
"@marijn/find-cluster-break" "^1.0.0"
"@codemirror/view@6.x", "@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0":
version "6.38.8"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.38.8.tgz#b7a746fc785defc16e96a2560bb073adabe8538a"
integrity sha512-XcE9fcnkHCbWkjeKyi0lllwXmBLtyYb5dt89dJyx23I9+LSh5vZDIuk7OLG4VM1lgrXZQcY6cxyZyk5WVPRv/A==
version "6.39.4"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.39.4.tgz#b76c73ab48c749cc9ab9e5e0a5d9e47df9f31cb5"
integrity sha512-xMF6OfEAUVY5Waega4juo1QGACfNkNF+aJLqpd8oUJz96ms2zbfQ9Gh35/tI3y8akEV31FruKfj7hBnIU/nkqA==
dependencies:
"@codemirror/state" "^6.5.0"
crelt "^1.0.6"
@@ -1328,9 +1328,9 @@
"@lezer/lr" "^1.0.0"
"@lezer/lr@^1.0.0", "@lezer/lr@^1.3.0":
version "1.4.4"
resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.4.tgz#6a9045fb948198bb29b5bb51d08e3b3128f1d40a"
integrity sha512-LHL17Mq0OcFXm1pGQssuGTQFPPdxARjKM8f7GA5+sGtHi0K3R84YaSbmche0+RKWHnCsx9asEe5OWOI4FHfe4A==
version "1.4.5"
resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.5.tgz#a0a7f505d96593f0f06708d50fb85962e33686c1"
integrity sha512-/YTRKP5yPPSo1xImYQk7AZZMAgap0kegzqCSYHjAL9x1AZ0ZQW+IpcEzMKagCsbTsLnVeWkxYrCNeXG8xEPrjg==
dependencies:
"@lezer/common" "^1.0.0"
@@ -1594,17 +1594,17 @@
dependencies:
postcss-selector-parser "6.0.10"
"@tanstack/virtual-core@3.13.12":
version "3.13.12"
resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz#1dff176df9cc8f93c78c5e46bcea11079b397578"
integrity sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==
"@tanstack/virtual-core@3.13.13":
version "3.13.13"
resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.13.tgz#1e55efe82730e60f4d68b1e2bc956bd3d94f307b"
integrity sha512-uQFoSdKKf5S8k51W5t7b2qpfkyIbdHMzAn+AMQvHPxKUPeo1SsGaA4JRISQT87jm28b7z8OEqPcg1IOZagQHcA==
"@tanstack/vue-virtual@^3.0.0-beta.60", "@tanstack/vue-virtual@^3.12.0", "@tanstack/vue-virtual@^3.8.1":
version "3.13.12"
resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.12.tgz#a66daac9e6822ce4bcba76a3954937440697c264"
integrity sha512-vhF7kEU9EXWXh+HdAwKJ2m3xaOnTTmgcdXcF2pim8g4GvI7eRrk2YRuV5nUlZnd/NbCIX4/Ja2OZu5EjJL06Ww==
version "3.13.13"
resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.13.tgz#8af64d1f832704ebf1217d119d224fecc0bb91af"
integrity sha512-Cf2xIEE8nWAfsX0N5nihkPYMeQRT+pHt4NEkuP8rNCn6lVnLDiV8rC8IeIxbKmQC0yPnj4SIBLwXYVf86xxKTQ==
dependencies:
"@tanstack/virtual-core" "3.13.12"
"@tanstack/virtual-core" "3.13.13"
"@tiptap/core@^2.26.1", "@tiptap/core@^2.27.1":
version "2.27.1"
@@ -1897,9 +1897,9 @@
integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==
"@types/node@*":
version "24.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.1.tgz#91e92182c93db8bd6224fca031e2370cef9a8f01"
integrity sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==
version "25.0.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.2.tgz#411f9dd6cb2bf5ee46aed7199a9f85ca6b068b4e"
integrity sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==
dependencies:
undici-types "~7.16.0"
@@ -2289,9 +2289,9 @@ base64-js@^1.3.1:
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
baseline-browser-mapping@^2.9.0:
version "2.9.2"
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.2.tgz#0ae89ec3e10e07c368b77def89db8044409461d1"
integrity sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==
version "2.9.7"
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.7.tgz#d36ce64f2a2c468f6f743c8db495d319120007db"
integrity sha512-k9xFKplee6KIio3IDbwj+uaCLpqzOwakOgmqzPezM0sFJlFKcg30vk2wOiAJtkTSfx0SSQDSe8q+mWA/fSH5Zg==
binary-extensions@^2.0.0:
version "2.3.0"
@@ -2390,9 +2390,9 @@ camelcase-css@^2.0.1:
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001759:
version "1.0.30001759"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001759.tgz#d569e7b010372c6b0ca3946e30dada0a2e9d5006"
integrity sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==
version "1.0.30001760"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz#bdd1960fafedf8d5f04ff16e81460506ff9b798f"
integrity sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==
chalk@^4.1.0:
version "4.1.2"
@@ -2668,9 +2668,9 @@ dompurify@3.2.6:
"@types/trusted-types" "^2.0.7"
dompurify@^3.2.6:
version "3.3.0"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.0.tgz#aaaadbb83d87e1c2fbb066452416359e5b62ec97"
integrity sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==
version "3.3.1"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.1.tgz#c7e1ddebfe3301eacd6c0c12a4af284936dbbb86"
integrity sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==
optionalDependencies:
"@types/trusted-types" "^2.0.7"
@@ -2699,9 +2699,9 @@ ejs@^3.1.6:
jake "^10.8.5"
electron-to-chromium@^1.5.263:
version "1.5.266"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.266.tgz#41ed029b3cf641c4ee071de42954b36dca8f5f4e"
integrity sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg==
version "1.5.267"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
engine.io-client@~6.5.2:
version "6.5.4"
@@ -2736,9 +2736,9 @@ entities@^4.4.0, entities@^4.5.0:
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9:
version "1.24.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
version "1.24.1"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.1.tgz#f0c131ed5ea1bb2411134a8dd94def09c46c7899"
integrity sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==
dependencies:
array-buffer-byte-length "^1.0.2"
arraybuffer.prototype.slice "^1.0.4"
@@ -4859,9 +4859,9 @@ supports-preserve-symlinks-flag@^1.0.0:
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
tailwindcss@^3.4.15:
version "3.4.18"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.18.tgz#9fa9650aace186644b608242f1e57d2d55593301"
integrity sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==
version "3.4.19"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.19.tgz#af2a0a4ae302d52ebe078b6775e799e132500ee2"
integrity sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
lms/__init__.py
+1 -1
View File
@@ -1 +1 @@
__version__ = "2.42.0"
__version__ = "2.43.0"
lms/lms/api.py
+5 -2
View File
@@ -319,6 +319,7 @@ def get_count_of_certified_members(filters=None):
@frappe.whitelist(allow_guest=True)
def get_certification_categories():
categories = []
seen = set()
docs = frappe.get_all(
"LMS Certificate",
filters={
@@ -329,9 +330,11 @@ def get_certification_categories():
for doc in docs:
category = doc.course_title if doc.course_title else doc.batch_title
if category not in categories:
categories.append(category)
if not category or category in seen:
continue
seen.add(category)
categories.append({"label": category, "value": category})
return categories
lms/locale/ar.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/bs.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/cs.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/da.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/de.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/eo.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/es.po
+126 -295
View File
File diff suppressed because it is too large Load Diff
lms/locale/fa.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/fr.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/hr.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/hu.po
+178 -347
View File
File diff suppressed because it is too large Load Diff
lms/locale/id.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/it.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/my.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/nb.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/nl.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/pl.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/pt.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/pt_BR.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/ru.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/sl.po
+111 -280
View File
File diff suppressed because it is too large Load Diff
lms/locale/sr.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/sr_CS.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/sv.po
+101 -270
View File
File diff suppressed because it is too large Load Diff
lms/locale/ta.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/th.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/tr.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/vi.po
+100 -269
View File
File diff suppressed because it is too large Load Diff
lms/locale/zh.po
+100 -269
View File
File diff suppressed because it is too large Load Diff