Skip to content

Conversation

@OmarIthawi
Copy link
Collaborator

@OmarIthawi OmarIthawi commented Jul 24, 2024

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

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/ 

List of commits

Checked, means cherry-picked.

pkulkark and others added 19 commits July 24, 2024 15:03
This adds the ability to get a list of detailed courses based on their
keys provided in the newly added `keys` query param in the `GET /courses/v1/courses/`
endpoint.
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.
* feat: Add course price in mobile enrollment api
)

Co-authored-by: Abdul  Moeez Zahid <abdul.moeez@025907584957.2tor.net>
…penedx#34273)

* feat: include access serializer into mobile info api view

* test: add tests for serializer and view methods

* test: move tests to common directory and update test case

* fix: cr fixes and use snake case for functions

* test: fix additional get call assertion

* feat: add required course access messages to mobile endpoint

* test: [AXM-229] Improve test coverage

* style: [AXM-229] Try to fix linters

* fix: remove redundant comment

* refactor: change names for the test files

---------

Co-authored-by: KyryloKireiev <kirillkireev888@gmail.com>
…urses on dashboard view (openedx#34848)

* feat: [AXM-24] Update structure for course enrollments API (openedx#2515)
---------
Co-authored-by: Glib Glugovskiy <glib.glugovskiy@raccoongang.com>

* feat: [AXM-53] add assertions for primary course (openedx#2522)
---------
Co-authored-by: monteri <36768631+monteri@users.noreply.github.com>

* feat: [AXM-297] Add progress to assignments in BlocksInfoInCourseView API (openedx#2546)
---------
Co-authored-by: NiedielnitsevIvan <81557788+NiedielnitsevIvan@users.noreply.github.com>
Co-authored-by: Glib Glugovskiy <glib.glugovskiy@raccoongang.com>
Co-authored-by: monteri <36768631+monteri@users.noreply.github.com>

Conflicts:
	lms/djangoapps/courseware/courses.py
@OmarIthawi
Copy link
Collaborator Author

Closed in favor of #34 due to sheer amount of conflicts.

@OmarIthawi OmarIthawi closed this Jul 25, 2024
@OmarIthawi OmarIthawi deleted the omar/v4-fixes branch July 25, 2024 07:58
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.

9 participants