Skip to content

Commit b20d045

Browse files
authored
Merge pull request #1650 from frappe/develop
chore: merge 'develop' into 'main'
2 parents 736ce8e + 6eb380e commit b20d045

31 files changed

Lines changed: 6820 additions & 3129 deletions

frappe-ui

Submodule frappe-ui updated 187 files

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"codemirror": "^6.0.1",
3232
"dayjs": "^1.11.6",
3333
"feather-icons": "^4.28.0",
34-
"frappe-ui": "^0.1.163",
34+
"frappe-ui": "^0.1.172",
3535
"highlight.js": "^11.11.1",
3636
"lucide-vue-next": "^0.383.0",
3737
"markdown-it": "^14.0.0",

frontend/src/pages/LessonForm.vue

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -714,17 +714,6 @@ iframe {
714714
width: 100%;
715715
}
716716
717-
.cdx-block.embed-tool::after {
718-
content: '';
719-
position: absolute;
720-
top: 0;
721-
left: 0;
722-
width: 100%;
723-
height: 100%;
724-
background: transparent;
725-
z-index: 1000;
726-
}
727-
728717
:root {
729718
--plyr-range-fill-background: white;
730719
--plyr-video-control-background-hover: transparent;

frontend/src/pages/ProfileEvaluationSchedule.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const evaluations = createListResource({
7777
],
7878
auto: true,
7979
orderBy: 'creation desc',
80-
limit: 100,
80+
pageLength: 500,
8181
cache: ['schedule', user.data?.name],
8282
transform(data) {
8383
return data.map((d) => {

frontend/vite.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default defineConfig({
3939
'showdown',
4040
'engine.io-client',
4141
'tailwind.config.js',
42+
'interactjs',
4243
'highlight.js',
4344
'plyr',
4445
],

frontend/yarn.lock

Lines changed: 356 additions & 315 deletions
Large diffs are not rendered by default.

lms/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.31.0"
1+
__version__ = "2.32.0"

0 commit comments

Comments
 (0)