Commit Graph

48531 Commits

Author SHA1 Message Date
Michael Youngstrom
fa12b8a481 Merge pull request #19787 from edx/youngstrom/remove-shards
Remove pytest shards from lms
2019-02-12 12:34:46 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Stu Young
5ac3ef7158 Merge pull request #19770 from edx/revert-19018-opencraft/taranjeet/opt-out-weekly-highlight-messages
Revert "Add api support to let users opt out of email updates."
2019-02-12 10:17:11 -05:00
Uzair Rasheed
baf6c156c2 Merge pull request #19711 from edx/LEARNER-6981/remove-links-from-spanish-footer
Remove un-translated page links from spanish website's footer
2019-02-12 20:04:12 +05:00
Awais Jibran
d82314f902 fixing quality 2019-02-12 18:45:18 +05:00
Nimisha Asthagiri
a921ebd4ae Merge pull request #19777 from edx/arch/account-api-social-links
Account API: Enhance Social Link API
2019-02-12 07:51:57 -05:00
Awais Jibran
717712391f Fixing conflicts 2019-02-12 17:50:58 +05:00
Nimisha Asthagiri
0e79129796 Account API: Enhance Social Link API 2019-02-11 20:17:04 -05:00
Michael Youngstrom
4b522f0aa0 Merge pull request #19783 from edx/juliasq/update_django_version
Update Django version to 1.11.20
2019-02-11 16:17:01 -05:00
uzairr
c477dca533 Remove un-translated page links from spanish website's footer
Currently, spanish website's main page has links in footer whose
pages are still un-translated.In this PR, links of them are
removed so that user-experience should be improved.

LEARNER-6981
2019-02-11 22:20:06 +05:00
Julia Eskew
44ca4d48ae Update Django version to 1.11.20 2019-02-11 11:08:56 -05:00
Ned Batchelder
7f53c3d985 Merge pull request #19761 from eduNEXT/lmm/courseoutline_translations
Fix Collapse All/Expand All translation
2019-02-11 08:12:00 -05:00
Luis Moreno
91ed45099b Fix Collapse All/Expand All translation 2019-02-11 07:40:41 -04:00
ihtram
7d7736c7f0 Merge pull request #19691 from edx/ihtram/YONK-1282
Discussion board AssertionError fixed
2019-02-11 14:56:28 +05:00
Jeremy Bowman
406aa21018 Merge pull request #19763 from singuliere/INCR-40-ipaddress
INCR-40 use ipaddress instead of ipaddr
2019-02-09 21:29:42 -05:00
singuliere
d00cb9bda8 INCR-40 use ipaddress instead of ipaddr 2019-02-09 13:10:06 +01:00
David Ormsbee
9f56afc18f Merge pull request #19380 from stvstnfrd/show-answer
Add new Option to Show Answer Dropdown.
2019-02-08 16:05:54 -05:00
Stu Young
e8374ad944 Merge pull request #19773 from open-craft/jill/flaky-tests-email-updates
Fixes flaky tests in schedules.tests.TestCourseUpdateResolver
2019-02-08 15:39:53 -05:00
stv
e7733faa1a Fix tests: Show Answer, Number of Attempts 2019-02-08 12:33:45 -08:00
Joseph Okonda
4a98e4626a Add new Option to Show Answer Dropdown.
In Studio: Introduces a new option, `after some number of attempts`
and a new entry box for specifying the number of attempts.
This allows course creators to specify that a given question's
answer is only viewable, i.e its show answer button is visible,
after the learner has attempted answering the question -
by hitting the submit button - a given number of times. Included
in this commit are unit tests for the new feature.
2019-02-08 12:33:40 -08:00
Christopher Pappas
bfc0c5acf5 INCR-24 | Run python-modernize on common/lib/calc 2019-02-08 14:52:17 -05:00
David Ormsbee
4aa6446533 Merge pull request #19385 from open-craft/pooja/implement-public-cohort
Implement public cohort for anonymous and unenrolled users
2019-02-08 13:28:02 -05:00
Michael Roytman
be80859443 Merge pull request #19683 from edx/matthugs/lms-onboarding-copy-changes
LMS copy changes to support using proctortrack's onboarding exams
2019-02-08 11:49:17 -05:00
Michael Roytman
f15fd361ae Merge pull request #19684 from edx/mroytman/EDUCATOR-3952-practice-proctored-to-onboarding
Change "practice exam" to "onboarding" for courses that support onboarding exams.
2019-02-08 11:48:56 -05:00
Shafqat Farhan
17afb2000d Discussion board AssertionError fixed (#1242) 2019-02-08 17:41:11 +05:00
Jillian Vogel
6dfbf94b87 Fixes flaky tests added by https://github.com/edx/edx-platform/pull/19018
using CacheIsolationTestCase
2019-02-08 13:57:25 +10:30
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 Roytman
af319f3c9a Update version of edx-proctoring and update copy to refer to onboarding exams in Studio for proctoring backends that support onboarding exams. 2019-02-07 14:29:26 -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
Pooja Kulkarni
9ddb1cc074 Implement public cohort
This PR is based on #19284 and is part of the
series of work related to the proposal #18134.

This PR avoids the assignment of
anonymous/unenrolled users to any cohort when
course is public. Anonymous or unenrolled users
will only see content that does not have a
content group assigned.
The "View Course" link to the course outline
is shown on the course about page for a course
marked public/public outline.
It also makes course handouts available for
public courses (not for public_outline).
This PR also hides the different warnings and
messages asking the user to sign-in and enroll
in the course, when the course is marked public.
It modifies the default public_view text to
include the component display_name when
unenrolled access is not available.
2019-02-07 21:42:21 +05:30
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 Hughes
a49f64a990 LMS copy changes to support using proctortrack's onboarding exams
rather than using practice exams

JIRA:EDUCATOR-3960
2019-02-06 15:27:06 -05:00
Matt Tuchfarber
b62d70441b Merge pull request #19631 from mahyard/master
tiny style modification
2019-02-06 15:18:21 -05:00