Commit Graph

48503 Commits

Author SHA1 Message Date
Shafqat Farhan
17afb2000d Discussion board AssertionError fixed (#1242) 2019-02-08 17:41:11 +05:00
George Babey
7172bf46c0 Merge pull request #19767 from edx/bessiesteinberg/ent-1515
Bump edx-enterpise to 1.2.11
2019-02-07 15:47:19 -05:00
Robert Raposa
d08cb2576a Merge pull request #19765 from edx/robrap/ARCH-379-add-user-id-scope
ARCH-379: add user_id scope and claim for JWT cookies
2019-02-07 15:27:43 -05:00
Michael Youngstrom
d6b9f71547 Merge pull request #19768 from edx/youngstrom/mkup
Run make upgrade
2019-02-07 15:06:56 -05:00
Bessie Steinberg
40382104a0 Bump edx-enterpise to 1.2.11
- Dependent on https://github.com/edx/edx-enterprise/pull/429
2019-02-07 14:51:08 -05:00
Jeremy Bowman
2b647e9cb0 Merge pull request #19759 from edx/jmbowman/TE-2851
TE-2851 Preserve stdout on Jenkins test failures
2019-02-07 14:50:32 -05:00
Michael Youngstrom
16970b30a0 Run make upgrade 2019-02-07 13:29:01 -05:00
David Ormsbee
ffeca6712f Merge pull request #19736 from edx/ormsbee/xblock_safe_depr
Don't break exports for uninstalled XBlock content
2019-02-07 11:40:20 -05:00
Robert Raposa
a213104790 add user_id scope and claim for JWT cookies
The following changes are made to add LMS user_id:
* Adds user_id scope to the JWT to provide the LMS user_id.
* JWT cookies always use the user_id claim.

ARCH-379
2019-02-07 10:44:35 -05:00
Stu Young
af94f3756f Merge pull request #19760 from edx/estute/fix-flaky-problem-test
wait for ajax on problem reset in test
2019-02-07 09:51:12 -05:00
Saleem Latif
29ba0208b7 Merge pull request #19722 from edx/saleem-latif/ENT-1481
ENT-1481: Update final copy recovery feature copy
2019-02-07 18:32:04 +05:00
Saleem Latif
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +05:00
Saleem Latif
7aa9ed5320 Merge pull request #19689 from edx/saleem-latif/ENT-1492
ENT-1492: Update dashboard alert link and account settings page styling
2019-02-07 15:53:46 +05:00
Saleem Latif
63f8074402 Update dashboard alert link and account settings page styling 2019-02-07 14:00:27 +05:00
Waheed Ahmed
bf6301c11e Merge pull request #19291 from edx/waheed/LEARNER-4434-discovery-support-beta-langs
Add support for beta languages
2019-02-07 13:10:27 +05:00
Awais Jibran
2c1eac8f47 Merge pull request #19018 from open-craft/opencraft/taranjeet/opt-out-weekly-highlight-messages
Add api support to let users opt out of email updates.
2019-02-07 12:47:31 +05:00
Taranjeet Singh
3eb9058dd2 Adds optional "unsubscribe" link and api support to let users opt out of email updates.
Scheduled emails show "unsubscribe" link if waffle switch `schedules.course_update_show_unsubscribe` is enabled, and
settings.ACE_ENABLED_POLICIES respects `bulk_email_optout`.

API endpoint allows GET/POST requests, which:

* GET asks for confirmation of opt-out
* POST accepts "unsubscribe" or "cancel", where "unsubscribe" creates the
  Optout entry, and "cancel" does nothing.
2019-02-07 11:47:10 +10:30
David Ormsbee
c0889e16ab Merge pull request #19266 from open-craft/paulo/bump_dndv2
Bump xblock-drag-and-drop-v2 to v2.2.1 which includes i18n support in JS files
2019-02-06 17:31:45 -05:00
Simon Chen
4fdbdffcf9 Merge pull request #19758 from edx/schen/rollout_gradebook
Roll out gradebook waffle flag to be default on
2019-02-06 15:48:28 -05:00
David Ormsbee
d0c353609d Don't break exports for uninstalled XBlock content
When an unknown content type is encountered, it's imported as a
RawDescriptor, which will preserve the OLX and export it back out. But
if we import a course while an XBlock is installed and then export it
after that XBlock is removed, we export RawDescriptors that never got to
save the original OLX and have a blank "data" field. Attempting to
export this used to fail and break export altogether. We now test that
the export continues to complete, and just skips over anything it can't
serialize out.

Note that this will stil export pointers in the export, so if you
uninstalled a "AmazingBlock" and exported, you might see something like
the following in a vertical's XML::

<vertical display_name="Unit">
  <amazing url_name="2edebb68d5734395a06b8a62b9bb677e"/>
</vertical>

However there would be no corresponding file at:
  /amazing/2edebb68d5734395a06b8a62b9bb677e.xml

In fact, there would be no /amazing directory at all in the export.

The better long term solution is probably to leave the pointer as-is
and export some generic file that can't be mistaken for OLX (say a
JSON file) that represents the raw key-value data we have in
Modulstore for the now unknown XBlock type. However, this commit at
least keeps export from crashing out entirely.
2019-02-06 15:36:59 -05:00
Stuart Young
ad6312b67b wait for ajax on problem reset in test 2019-02-06 15:29:31 -05:00
Matt Tuchfarber
b62d70441b Merge pull request #19631 from mahyard/master
tiny style modification
2019-02-06 15:18:21 -05:00
Calen Pennington
c8688633b3 Merge pull request #19733 from edx/unicode5
fix unicode strings in pavelib/
2019-02-06 15:06:54 -05:00
Jeremy Bowman
3e28f90ed8 TE-2851 Preserve stdout on Jenkins test failures 2019-02-06 14:15:54 -05:00
Simon Chen
e8e396cac5 Roll out gradebook waffle flag to be default on 2019-02-06 14:00:11 -05:00
Jeremy Bowman
00cdc7a7ef Merge pull request #19757 from edx/jmbowman/docker_shell
Add pull and shell make targets
2019-02-06 13:15:57 -05:00
Jeremy Bowman
3b7817aec5 Add pull and shell make targets 2019-02-06 12:06:07 -05:00
David Ormsbee
857769e379 Merge pull request #19022 from edx/ormsbee/fix_ccx_data_migration
Remove course publish from CCX data migration.
2019-02-06 12:04:53 -05:00
Calen Pennington
829227ade3 Merge pull request #19663 from cpennington/fbe-improve-course-api-performance
Fbe improve course api performance
2019-02-06 11:01:25 -05:00
Calen Pennington
972ad9cb1f Merge pull request #19742 from edx/unicode6
fix unicode strings in lms/ part 1
2019-02-06 10:32:23 -05:00
Calen Pennington
e575cf30f1 Merge pull request #19731 from edx/unicode4
fix unicode strings in common/
2019-02-06 10:13:06 -05:00
Calen Pennington
43d975a92a Select related CourseOverview.image_set when loading the course_api 2019-02-06 10:11:16 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Calen Pennington
6d22866e78 Cache org-site lookups in the RequestCache 2019-02-06 10:11:15 -05:00
Calen Pennington
6c596f7c49 Allow courses api to return data incrementally
Prior to this commit, the course api (/api/courses/v1/courses/)
performed all the work necessary to return all courses available
to the user, and then only actually returned on page's worth of those
courses.

With this change, the api now does the work incrementally, computing
only the data needed to fetch the courses up to and including the page
being returned. This still increases approximately linearly as
the page number accessed being increases, but should be more cache-friendly.
One side effect of this is that the max_page reported by pagination
will be an overestimate (it will include pages that are removed due
to a users access restrictions).

This change also changes the sort-order of courses being returned by the
course_api. By sorting by course-id, rather than course-number, we
can sort in the database, rather than in Python, and defer loading data
from the end of the list until it is requested.

REVMI-90
2019-02-06 10:11:15 -05:00
Calen Pennington
9ff9c33f59 Add a test that shows how bad course api query counts are 2019-02-06 10:11:15 -05:00
Waheed Ahmed
c48df3214b update bokchoy db cache. 2019-02-06 16:13:24 +05:00
Waheed Ahmed
d76a2463fa Add support for beta languages.
Whenever user selects a beta language on account settings page,
show a page level warning message that this language is not
fully translated along with action to revert.

LEARNER-5654
2019-02-06 15:18:04 +05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Mahyar Damavand
84f609a269 tiny style modification 2019-02-05 23:37:14 +03:30
Zachary Hancock
945debb00f Merge pull request #19739 from edx/zhancock/progress-override
Grading Overrides on Progress Page
2019-02-05 11:32:12 -05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
Matthew Piatetsky
6cf44a0467 fix unicode strings in pavelib/ 2019-02-05 09:14:20 -05:00
Zach Hancock
8a55435b1e progress page to represent gradebook overrides 2019-02-04 17:06:53 -05:00
Jeremy Bowman
33d16d8e24 Merge pull request #19745 from edx/jmbowman/TE-2852
TE-2852 Preserve screenshots in bok-choy pipeline jobs
2019-02-04 15:53:19 -05:00
Dave St.Germain
bf692acea6 Merge pull request #19690 from edx/dcs/retire-perm
Refactored the retirement permission to use Django rules
2019-02-04 15:17:38 -05:00
Calen Pennington
703d510057 Merge pull request #19730 from edx/unicode3
fix unicode strings in cms/
2019-02-04 15:14:41 -05:00
Calen Pennington
c2d19b5930 Merge pull request #19728 from edx/unicode1
Revert "Revert "change banner date localization to use dateutilfactory""
2019-02-04 15:13:34 -05:00
Jeremy Bowman
727ef94326 TE-2852 Preserve screenshots in bok-choy pipeline jobs 2019-02-04 15:09:00 -05:00
Matthew Piatetsky
7df30938c4 fix unicode strings in cms/ 2019-02-04 13:01:51 -05:00