Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,873 Commits 1 Branch 0 Tags
27dfbd02408ffdbf002dadcab2e9939db9f2d42e
Commit Graph

16731 Commits

Author SHA1 Message Date
Waheed Ahmed
6fa5893abb Merge pull request #19963 from edx/waheed/LEARNER-6643-fix-change-enrollment-command 
Fix change enrollment command for credit.
 2019-03-12 18:37:23 +05:00
Waheed Ahmed
458e8482ea Fix change enrollment command for credit. 
Get provider id from ecommerce upon changing enrollment to credit
instead of setting course_key org.

LEARNER-6643
 2019-03-12 15:30:48 +05:00
edx-cache-uploader-bot
adbf5fe33b Updating migrations 2019-03-11 16:43:55 -04:00
Calen Pennington
5d3c9b36df Merge pull request #19964 from cpennington/fbe-query-perf 
Sort in python and add an index to improve StackedConfigModel.current…
 2019-03-11 12:22:59 -04:00
Stu Young
129438420e Merge pull request #19970 from edx/estute/remove-flaky-account-settings-test 
remove flaky account settings page test
 2019-03-11 11:18:04 -04:00
Calen Pennington
a2a340bcd0 Improve the performance of access checking for a specific user in CourseViewList by prefetching data 2019-03-11 10:37:53 -04:00
Stu Young
5a1105bb43 Merge pull request #19966 from edx/testeng/bokchoy_auto_cache_update_57f631ad1d9b1523d1e35b51c2f8f17b926fd050 
Bokchoy db cache update
 2019-03-11 09:41:22 -04:00
DawoudSheraz
f64c602887 Add aria-label toggling for play/pause and fill browser buttons 2019-03-11 11:51:25 +05:00
Stuart Young
648f15a514 remove flaky account settings page test 2019-03-08 17:38:27 -05:00
edx-cache-uploader-bot
96b39e4aa1 Updating migrations 2019-03-08 14:04:59 -05:00
Stu Young
dbbfaf8bae Merge pull request #19954 from edx/testeng/bokchoy_auto_cache_update_224fa696472c3fd35f4920ce2f428d351c3a948f 
Bokchoy db cache update
 2019-03-07 12:15:51 -05:00
edx-cache-uploader-bot
44b7dd2b28 Updating migrations 2019-03-07 10:56:29 -05:00
zrana
c43b14a0ff Merge pull request #19896 from edx/zeeshan/remove_flaky_studio_settings_test 
Remove flaky studio settings test
 2019-03-07 19:20:31 +05:00
zrana
72c9bd1bae Merge pull request #19901 from edx/zeeshan/remove_flaky_lms_insturctor_dashboard_test 
Remove flaky lms instructor dashboard test
 2019-03-07 19:20:16 +05:00
AsadAzam
2a1cff52d5 Merge pull request #19898 from edx/asad/educator-3928-fix-transcript-txt-500 
Fixed download txt transcript 500
 2019-03-07 18:31:22 +05:00
noraiz-anwar
837219f792 add aria-label in video caption control 2019-03-07 15:47:30 +05:00
Robert Raposa
c0ae3a54fd Merge pull request #19949 from edx/ARCH-472-event-username-to-userid 
ARCH-472: Add user_id for username in event data.
 2019-03-06 18:14:28 -05:00
Robert Raposa
e8d60611de Add user_id for username in event data. 
In certain use cases, a caller may have the username and not the
user_id. In these cases, we add the user_id since events have
standardized on using the user_id as the unique id of a user.

ARCH-472
 2019-03-06 17:06:53 -05:00
Michael Roytman
5c4c3d0753 Merge pull request #19948 from edx/mroytman/EDUCATOR-4083-min-price-masters-course-mode 
allow configurability of the minimum price for a course mode
 2019-03-06 16:03:35 -05:00
Cali
5ec3ab2068 Merge pull request #19946 from edx/cstenson/delete_flaky_tests 
Delete flaky bokchoy tests.
 2019-03-06 14:56:47 -05:00
Michael Roytman
c8b4f7e779 allow configurability of the minimum price for a course mode 2019-03-06 14:26:00 -05:00
Cali Stenson
362403bf7a Delete flaky bokchoy tests. 
EDUCATOR-4164, EDUCATOR-4165, EDUCATOR-4166
 2019-03-06 14:20:18 -05:00
Cali
81538fe25b Merge pull request #19851 from edx/cstenson/dashboard_metadata 
Add price information to enrollments and create dashboard_metadata
 2019-03-06 11:04:18 -05:00
asadazam93
f7d918e7ca Fixed download txt transcript 500 2019-03-06 16:53:47 +05:00
Cali Stenson
7e6147f714 Add price information to enrollments and create dashboard_metadata 
for experiments.

REVEM-174
 2019-03-05 16:55:04 -05:00
Stuart Young
a79e064192 remove flaky bokchoy test 2019-03-05 13:47:17 -05:00
DawoudSheraz
a5fe66863e fix video player speed adjustments 2019-03-05 17:37:33 +05:00
Mike Dikan
2fc27a9caa Merge pull request #19693 from edx/mdikan/hackathon-21 
Removal of deprecated external auth.
 2019-03-04 13:48:57 -05:00
Feanil Patel
c8ebcff16b Merge pull request #19908 from edx/feanil/remove_flaky_bokchoy_test 
Remove a flaky bokchoy test.
 2019-03-04 10:57:07 -05:00
Waheed Ahmed
dbad75467e Return credit status error if no provider info found. 
Return credit status error if no provider info found in provider info by
id dict. Also add logs to get an idea what is in this dict.

LEARNER-6643
 2019-03-04 15:59:55 +05:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
Feanil Patel
25a043e17c Remove a flaky test. 
Failing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2061/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2051/

The test passes in 2051 but then fails in build 2061 for the same
commit.
 2019-03-01 14:31:10 -05:00
Feanil Patel
d9cfd19459 Delete flaky test. 
Failing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2051/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2061/

This test fails on build 2051 and passes on 2061 but both builds are for
the same commit.
 2019-03-01 14:28:32 -05:00
Feanil Patel
49784dc36c Remove a flaky bokchoy test. 
This test failed and then passed for edx-platform commit: 9b358aaffc

Failed Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-master/351/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-master/352/
 2019-03-01 11:29:22 -05:00
zrana
63c789ef18 Remove flaky lms instructor dashboard test 2019-02-28 17:11:52 +05:00
zrana
459d2f74a1 remove flaky studio advance settings test 2019-02-28 16:14:16 +05:00
Shadi Naif
1b83f24d3c Convert the (Email Change Confirmation) message to use edx-ACE 
Basically, this was done by:
1. Adding new class type in [common/djangoapps/student/message_types.py]
2. Adding new files for the ace template in a new directory named
    [common/templates/student/edx_ace/emailchangeconfirmation]
3. Removing old template files
    [confirm_email_change.txt] and [email_change_subject.txt]
    from the directories:
    [lms/templates/emails] and
    [common/test/test_sites/test_site/templates/emails]
4. Converting the [confirm_email_change] code to use [ace.send()]
 2019-02-27 16:22:16 +02:00
Matt Tuchfarber
89c36ad65a Merge pull request #19858 from edx/bessiesteinberg/ent-1591 
ENT-1591: Validate Recovery Email a Primary Email
 2019-02-26 12:37:51 -05:00
Matt Hughes
790f598ded Merge pull request #19872 from edx/matthugs/old-IDV-flaky-bokchoy-test 
Add IDV bypass mechanism for bok_choy tests
 2019-02-26 10:50:09 -05:00
AsadAzam
69f2334934 Merge pull request #19867 from edx/asad/Educator-3928-add-logs 
Added logs
 2019-02-26 16:17:33 +05:00
Matt Hughes
b4664f8377 Add IDV bypass mechanism for bok_choy tests 
An older test was deleted based on flakiness around the ID
verification process; this test eliminates the dependency on IDV by
enabling manual ID verification (an enterprise-motivated workaround
for IDV requirements) via the auto_auth endpoint.

JIRA:EDUCATOR-1178
 2019-02-25 15:58:11 -05:00
emma-green
507cfb8942 Merge pull request #19849 from edx/emma-green/REVEM-176/C/Hacky-cache-course_runs-to-programs 
add course to program caching
 2019-02-25 10:41:51 -05:00
Stu Young
98326d7986 Merge pull request #19847 from edx/testeng/bokchoy_auto_cache_update_e403eee0109f7f5f12f75aded566044bb302816b 
Bokchoy db cache update
 2019-02-25 10:36:16 -05:00
Nimisha Asthagiri
3b411890a6 Merge pull request #19510 from CredoEducation/text-input-problem-pr 
Bugfix: Text Input problem type expects numeric answer when correct answer starts with a number
 2019-02-25 10:28:32 -05:00
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
asadazam93
12d20697c5 Added logs 2019-02-25 17:18:47 +05:00
Bessie Steinberg
16ceb8103c ENT-1591: Validate Recovery Email a Primary Email 
- On the accounts page validate that a recovery email is not any of the
  existing primary emails or one that has been retired.
 2019-02-22 13:27:10 -05:00
Emma Green
57b7150b09 add course to program caching 2019-02-22 13:18:23 -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