# Conflicts:
#	requirements/edx/github.txt

Modify existing Programs migration to account for help_text change

SOL-1417 Certs: Allow CSV upload for Cert Exceptions

Add pagination support to course catalog API

SOL-1389: Cert Exception: Add error states and messages

Support multiprocess bok-choy testing for discussion

SOL-1439: removed certificates delivered dependency on certificate eligibility

SOL-1466: Make sure web view renders certs only if downloadable.

* Catalog results are now paginated
* Implements the new namespaced pagination described at
  https://openedx.atlassian.net/wiki/pages/viewpage.action?pageId=47481813
* API level code returns pythonic business objects
* View layer performs serialize at the view layer
* Convert views to use DRF generic views
* Removes an unintentional authentication decorator that caused
  the detail endpoint to return a 401 for anonymous users

MA-1724

MA-1211; Discussion API - make boolean params case insensitive

Do not install xblock-utils in editable mode

split variables on multiple lines

changes after feedback from Afzal

Aamir khan/ecom 1447 login error message

Revert "Fixing CohortMembership and ATOMIC_REQUESTS issue"

Prevents makemigrations from creating a new migration for the programs app.

This reverts commit 12130c80.
Manual testing found this to not fix the bug it claimed to fix.

Initial migrations for verified deadlines for self paced

Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements

MA-1667: Update Mobile API to support Web Certificates

CohortMemberships minimal fix

What had been happening was related to the fact that ATOMIC_REQUESTS is now on,
preventing writing to the database until a request is completed.

The problem with that was that CohortMemberships, with their explicit
transaction handling, were breaking that rule and touching the database.
The CohortMembership needs to also touch the database to update the
underlying course_user_groups information, to prevent the database from
getting into a strange state.

After this commit, every time a CohortMembership is updated or created, the
corresponding course_user_groups are also updated and explicitly written to
the database. This occurs atomically with the CohortMembership, and does not
wait for the end of the request.

Suggest the devops group alias, rather than individual names

Upgrade ORA version to fix staff tools styling

OwnLearnerProfile multiprocessing support

Make cohort management tests multiprocess capable.

This fixes a flaky condition that is only exposed when
tests are run in multiprocessing mode.

Fix a flaky test condition that only occurs in
multiprocessing mode. Make the page definition more
specific; the previous implementation would not fully
render all objects in time.

Avoid race condition related to events order (in faster,
multiprocess testing, the order is not exactly the same since
some events arrive at once).

Add scenario for testing unicode cohort.

Verifying the events is a TODO because the verification method
will need to be refactored to handle an additional cohort
that's not included in setUp. (Or refactor the setup, or refactor
the unicode test, etc.)

Help text update for full name