Commit Graph

16682 Commits

Author SHA1 Message Date
Dave St.Germain
954c8e1a67 Merge pull request #19771 from edx/dahlia/masters-track
Added master's track
2019-02-25 10:11:24 -05:00
Michael Youngstrom
9631fc2f88 Unpin sortedcontainers for python3 support 2019-02-21 17:27:13 -05:00
Jeremy Bowman
5c7a8e3ac1 Merge pull request #19622 from cclauss/Fix-parens-for-Python3
Fix explicit tuple parameters for Python 3
2019-02-21 15:45:09 -05:00
Farhanah Sheets
5b38c7e39e Merge pull request #19825 from edx/aehsan/learner-6238/update_deprecated_pygeoip_to_geoip2
update pygeopip to geoip2
2019-02-21 13:02:47 -05:00
Calen Pennington
cd107d3cf9 Merge pull request #19751 from edx/unicode10
enable unicode format string linter
2019-02-21 06:07:11 -05:00
zrana
7d59e82a86 Merge pull request #19429 from edx/lett_2_bc_lti_consumer_tests
Convereted lettuce tests into bokchoy for LTI Xblock
2019-02-21 14:54:49 +05:00
zrana
243145c706 Convereted lettuce tests into bokchoy for LTI Xblock 2019-02-21 13:31:27 +05:00
Calen Pennington
78c8950ea3 Clean up a few remaining unicode format string errors 2019-02-20 15:28:14 -05:00
adeelehsan
3e2764d9c0 update pygeopip to geoip2
Update deprecated pygeoip
to geoip2 and all usages
of it

Learner-6238
2019-02-21 00:42:05 +05:00
Calen Pennington
0ffcf3a4b0 Merge pull request #19835 from edx/revert-19677-emma-green/REVEM-176/cache-course_runs-to-programs
Revert "WIP:Cache course runs to programs"
2019-02-20 13:37:57 -05:00
Matt Hughes
17f0a4fb52 Allow educators to partition masters students as content groups
JIRA:EDUCATOR-4022
2019-02-20 12:40:53 -05:00
Matt Hughes
b7523aaea3 Merge pull request #19828 from edx/matthugs/fix-flaky-data-downloads-tab-tests
Fix flaky test_list_student_profile_information
2019-02-20 12:29:05 -05:00
emma-green
cbf3f78325 Revert "WIP:Cache course runs to programs" 2019-02-20 12:03:07 -05:00
emma-green
304fba5959 Merge pull request #19677 from edx/emma-green/REVEM-176/cache-course_runs-to-programs
WIP:Cache course runs to programs
2019-02-20 09:55:36 -05:00
cclauss
350b201e43 INCR-29: Run python-modernize on common/lib/chem
Signed-off-by: cclauss <cclauss@me.com>
2019-02-20 00:40:27 +01:00
Jeremy Bowman
974ae50bf4 Merge pull request #19620 from cclauss/new-style-exceptions
Old style exceptions --> new style for Python 3
2019-02-19 16:31:35 -05:00
Emma Green
f2139bbe2f add courses to programs to cache 2019-02-19 15:17:23 -05:00
Matt Hughes
aebe6cf446 Fix flaky test_list_student_profile_information 2019-02-19 12:38:40 -05:00
bmedx
7df1e05f49 Fix xxslint errors in touched files 2019-02-19 11:24:24 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
cclauss
44d62fac75 Fix explicit tuple parameters for Python 3 2019-02-19 12:37:34 +01:00
adeelehsan
a05b3a3305 Merge pull request #19807 from edx/aehsan/LEARNER-6183/disable_third_party_if_account_password_is_unusable
Disbale third party login
2019-02-18 12:38:11 +05:00
Bessie Steinberg
1a94a69560 ENT-1512: Make Recovery Email Retireable 2019-02-15 14:21:32 -05:00
Awais Jibran
c3682237f8 Merge pull request #19782 from edx/aj/fix-capa-problem-response-csv
Fix csv of problem responses silent failure
2019-02-15 16:32:35 +05:00
adeelehsan
73f57457c0 Disbale third party login
if user password is unusable
then disable third party login

LEARNER-6183
2019-02-15 16:03:11 +05:00
Saleem Latif
00b0baabbb Updating recovery email address from an already verified email address auto verifies the new address 2019-02-15 11:48:11 +05:00
Awais Jibran
04d17d55a9 Fix csv of problem responses silent failure 2019-02-14 11:37:32 +05:00
singuliere
631c173b1b INCR-82 remove dependency on code_block_timer 2019-02-14 00:51:04 +01:00
Jeremy Bowman
911aecefbb Merge pull request #19795 from edx/jmbowman/progress_page_screenshots
Capture screenshots on progress page test failures
2019-02-13 13:49:44 -05:00
Dave St.Germain
436416d86d Added modes to coursemode model 2019-02-13 10:21:04 -05:00
Dave St.Germain
6802a38a9d Added master's track
Added mode option to course enrollment management command
2019-02-13 10:21:04 -05:00
Nimisha Asthagiri
d62114dede Remove Profile Tab on Dashboard pages 2019-02-13 00:00:34 -05:00
Jeremy Bowman
193ef1ceb7 Capture screenshots on progress page test failures 2019-02-12 20:32:54 -05:00
Michael Youngstrom
d21a57715d Merge pull request #19793 from edx/youngstrom/remove-commonlib-shards
Remove shards from commonlib-unit tests
2019-02-12 17:15:33 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Jeremy Bowman
b046ce89b4 More reliable container publish in bok-choy tests 2019-02-12 14:10:54 -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
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
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
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
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
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +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
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