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.

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

feat: Mobile API v4 from Redwood and master into palm.nelp #34

Merged
merged 11 commits into from
Aug 6, 2024

Conversation

OmarIthawi
Copy link
Collaborator

Bring Mobile API v4 from Redwood and master into palm.nelp.

List of commits

List of commits on openedx/edx-platform:master compared to open-release/plam.nelp:

edx-platform $ git hist --oneline ...upstream/master -- lms/djangoapps/mobile_api/ 

The following the cherry-picked from master:

pkulkark and others added 8 commits July 25, 2024 10:45
Conflicts:
	lms/djangoapps/instructor/tests/test_filters.py
	lms/djangoapps/learner_recommendations/tests/test_views.py
	openedx/core/djangoapps/notifications/tests/test_views.py
Conflicts:
	common/djangoapps/student/tests/test_email.py
	lms/djangoapps/learner_recommendations/tests/test_views.py
	openedx/core/djangoapps/notifications/tests/test_views.py
Some of the places where we had explicit copies of the password were not
necessary so we referece the exsting TEST_PASSWORD variable where
possible.
…urses on dashboard view (openedx#34848)

* feat: [AXM-24] Update structure for course enrollments API (openedx#2515)
---------
Co-authored-by: Glib Glugovskiy <[email protected]>

* feat: [AXM-53] add assertions for primary course (openedx#2522)
---------
Co-authored-by: monteri <[email protected]>

* feat: [AXM-297] Add progress to assignments in BlocksInfoInCourseView API (openedx#2546)
---------
Co-authored-by: NiedielnitsevIvan <[email protected]>
Co-authored-by: Glib Glugovskiy <[email protected]>
Co-authored-by: monteri <[email protected]>

Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/mobile_api/users/tests.py
@OmarIthawi OmarIthawi changed the title Omar/mobile v4 api take2 feat: Mobile API v4 from Redwood and master into palm.nelp. Jul 25, 2024
@OmarIthawi OmarIthawi changed the title feat: Mobile API v4 from Redwood and master into palm.nelp. feat: Mobile API v4 from Redwood and master into palm.nelp Jul 25, 2024
@OmarIthawi
Copy link
Collaborator Author

@johanseto @andrey-canon Tested on devstack:

Screenshot from devstack

image

Copy link
Collaborator

@johanseto johanseto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mobile API working in my local env
2024-07-29_09-51

Copy link
Collaborator

@shadinaif shadinaif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shadinaif
Copy link
Collaborator

Tests on staging went fine, merging...

@shadinaif shadinaif merged commit e9609fb into open-release/palm.nelp Aug 6, 2024
39 of 40 checks passed
@shadinaif shadinaif deleted the omar/mobile-v4-api-take2 branch August 6, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants