Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge 'develop' into 'main' #1151

Merged
merged 30 commits into from
Nov 25, 2024
Merged

chore: merge 'develop' into 'main' #1151

merged 30 commits into from
Nov 25, 2024

Conversation

frappe-pr-bot
Copy link
Collaborator

Automated weekly release

yarin-zhang and others added 30 commits November 11, 2024 10:30
@yarin-zhang
Add Chinese locale
be66c56
@yarin-zhang
Update Revision Date
5e61601
@yarin-zhang
Update Chinese locale
0fb18f9
@yarin-zhang
Update Chinese locale
ee6685e
@yarin-zhang
Update Chinese locale
fac0038
@yarin-zhang
Merge branch 'develop' into develop
b5551fd
@yarin-zhang
Update Chinese locale
1ba63a2
@yarin-zhang
Merge branch 'develop' into develop
4ee1693
@pateljannat
feat: learning paths
e1a7838
@pateljannat
feat: reorder courses and students view for programs
582c7af
@pateljannat
fix: changed SCORM input from checkbox to switch with better description
460edc7
@pateljannat
Merge pull request #1144 from pateljannat/issues-52
29e356f 
fix: changed SCORM input from checkbox to switch with better description
@pateljannat
chore: Persian translations
fcaaee9
@pateljannat
feat: program restrictions
64ed0b3
@pateljannat
feat: added progress column in program members list
68e87f2
@pateljannat
Merge pull request #1146 from frappe/l10n_develop2
a394952 
chore: sync translations from crowdin
@pateljannat
Merge pull request #1145 from pateljannat/learning-paths
7cafaf5 
feat: learning paths
@yarin-zhang
Merge branch 'develop' into develop
cb324f6
@pateljannat
feat: onboarding steps
58f109e
@pateljannat
Merge pull request #1147 from pateljannat/onboarding-steps
40bcc4d 
feat: onboarding steps
@frappe-pr-bot
chore: update POT file
1c52979
@pateljannat
chore: Persian translations
de0675f
@pateljannat
chore: Swedish translations
0ac32ee
@pateljannat
Merge pull request #1115 from yarin-zhang/develop
cfa1aa8 
Add Chinese locale
@pateljannat
Merge pull request #1148 from frappe/pot_develop_2024-11-22
044907e 
chore: update POT file
@pateljannat
Merge pull request #1149 from frappe/l10n_develop2
562020d 
chore: sync translations from crowdin
@pateljannat
fix: disable desk_access for lms roles
83338a5
@pateljannat
fix: amount validation for course
d49d638
@pateljannat
Merge pull request #1150 from pateljannat/roles-desk-access-issue
a90e3d6 
fix: desk access and course amount validation issue
@frappe-bot
chore(release): Bumped to Version 2.13.0
1ecdbd9
@cypress Cypress
Copy link

cypress bot commented Nov 25, 2024 •
edited
Loading

lms    Run #849

Run Properties:  status check passed Passed #849  •  git commit 6f24c7c38c ℹ️: Merge a90e3d611c0a88e69533d4bce89f22227bef7549 into db380995571682dc9eb9d4a47f7b...
Project lms
Branch Review develop
Run status status check passed Passed #849
Run duration 00m 37s
Commit git commit 6f24c7c38c ℹ️: Merge a90e3d611c0a88e69533d4bce89f22227bef7549 into db380995571682dc9eb9d4a47f7b...
Committer Frappe PR Bot
View all properties for this run ↗︎
Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 1
View all changes introduced in this branch ↗︎

@pateljannat pateljannat merged commit 95e9087 into main Nov 25, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@frappe-pr-bot @pateljannat @yarin-zhang @frappe-bot