Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,953 Commits 1 Branch 0 Tags
174c01759fafd6c8984479f7a445b140b4478618
Commit Graph

45953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
174c01759f Implement retire users function in the SurveyAnswer model for GDPR 2018-04-30 13:07:32 -04:00
Brian Mesick
2be587d32d Merge pull request #18014 from edx/bmedx/retirement_state_mgmt 
Add a management command and settings to populate RetirementState models
 2018-04-30 09:28:21 -04:00
edX Transifex Bot
7e05358534 Update translations 2018-04-29 17:17:54 -04:00
Cory Lee
d400b47ed8 Merge pull request #18087 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-27 17:52:15 -04:00
Eric Fischer
239177a5f5 Merge pull request #18084 from edx/efischer/optimize_again 
Avoid fetching full group list repeatedly
 2018-04-27 17:06:16 -04:00
Feanil Patel
49a2a5d1b7 Merge pull request #18072 from stvstnfrd/clean/virtual-universities 
Remove unused VIRTUAL_UNIVERSITIES setting
 2018-04-27 15:22:04 -04:00
Feanil Patel
ae8e525ba2 Merge pull request #18080 from edx/feanil/remove_flaky_handout_tests 
Remove these tests because they are flaky.
 2018-04-27 15:18:58 -04:00
Waheed Ahmed
c16cbd7a54 Fix course selection on single support form. 
Use defaultValue instead of value attribute.

LEARNER-5126
 2018-04-27 15:17:59 -04:00
Eric Fischer
3198efb93d Avoid fetching full group list repeatedly 2018-04-27 15:13:47 -04:00
sanfordstudent
965c462418 Merge pull request #18061 from edx/sstudent/grading-policy-stuff 
rate limit
 2018-04-27 15:12:21 -04:00
Simon Chen
b5ca813fa6 Merge pull request #18037 from edx/sofiya/ed-2706 
Unlink CreditRequirementStatus PII for retired users
 2018-04-27 14:45:12 -04:00
stv
5d6e6a4283 Remove unused META_UNIVERSITIES setting 
This was removed back in July 2013 [1].

[1] e8ee29786f
 2018-04-27 11:34:56 -07:00
Sofiya Semenova
04c29b2099 Unlink CreditRequirementStatus PII for retired users 2018-04-27 13:04:29 -04:00
Ned Batchelder
cc2fdaea59 Merge pull request #18071 from caesar2164/add-mktg-url-link-map-env-tokens 
Get MKTG_URL_LINK_MAP from ENV_TOKENS in CMS
 2018-04-27 11:17:16 -04:00
Feanil Patel
2c7dd7b97c Remove these tests because they are flaky. 
They all rely on modifying the handout which can sometimes fail.
 2018-04-27 10:48:04 -04:00
Michael Terry
502287b07e Add some links to student records 
Add some waffle-guarded connection points to the Credentials service
to start filling out the user flow for Student Records.

Specifically, add a button to the Program Progress Details page if
a certificate exists, and add a link in the Learner Profile page.

Both only appear if the 'student_records' waffle switch is active.

LEARNER-4701
 2018-04-27 09:52:01 -04:00
Ned Batchelder
4297c999c4 Merge pull request #18069 from edx/nedbat/dont-bork-queryset-delete 
Properly clean up a wrapped function
 2018-04-27 08:05:56 -04:00
Saleem Latif
d7fca395aa Merge pull request #18045 from edx/saleem-latif/ENT-908 
ENT-908: Hide SSO related messages on login page if user is not in the SSO pipeline.
 2018-04-27 12:08:31 +05:00
Saleem Latif
361f4a6bc9 Hide SSO related messages on login page if user is not in the SSO pipeline. 2018-04-27 11:06:45 +05:00
stv
3cc9d78ca8 Remove unused VIRTUAL_UNIVERSITIES setting 
It looks like this was part of the original rollout of the microsites
feature back in December 2013 [1], but was quickly removed in February
2014 [2]. These references have been orphaned ever since.
I can find no other references to it in the platform, save these.

[1] a3211a7405
[2] aa43689a93
 2018-04-26 20:03:14 -07:00
Giulio Gratta
1a7110f0e0 Get MKTG_URL_LINK_MAP from ENV_TOKENS in CMS 2018-04-26 16:57:07 -07:00
Ned Batchelder
c346b6423e Merge pull request #17748 from open-craft/jill/swift_content_length_from_fd_master 
Set SWIFT_CONTENT_LENGTH_FROM_FD=False
 2018-04-26 17:03:31 -04:00
Ned Batchelder
6c3bd5d384 Merge pull request #17368 from mitodl/pdpinch/remove-constansts-and-suffixes 
Remove physical constants and suffixes from calc.py
 2018-04-26 16:54:25 -04:00
Cory Lee
a2d33979ce Merge pull request #18068 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 16:02:56 -04:00
Matthew Piatetsky
b41275774f Merge pull request #18039 from edx/fix_refundable_status_for_audit 
Fix refundable status for audit orders
 2018-04-26 15:58:21 -04:00
Ned Batchelder
9b63a06bfc Properly clean up a wrapped function 2018-04-26 15:50:05 -04:00
Jeremy Bowman
3851a645bb Merge pull request #18041 from edx/jmbowman/TE-2528 
TE-2528 Upgrade testing dependencies
 2018-04-26 15:34:16 -04:00
Jeremy Bowman
52e72c636d Merge pull request #18067 from edx/jmbowman/TE-2551 
TE-2551 Fix commons.js optimization reliability
 2018-04-26 15:14:31 -04:00
Sanford Student
3f91238564 rate limit 2018-04-26 15:06:29 -04:00
bmedx
9f53f79a62 Add a management command and settings to populate RetirementState models 2018-04-26 14:41:26 -04:00
Jeremy Bowman
328da7f73b TE-2551 Fix commons.js optimization reliability 2018-04-26 14:34:38 -04:00
Gabe Mulley
a787c7b75d Merge pull request #18028 from edx/mulby/support-cross-domain-ajax 
support cross domain ajax requests to the experiments APIs
 2018-04-26 13:28:09 -04:00
edx-pipeline-bot
d294c3f729 Merge pull request #18062 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 13:18:20 -04:00
Eric Fischer
d1d5427be6 Merge pull request #18063 from edx/efischer/cache_partitions 
Cache list of course partitions
 2018-04-26 13:13:01 -04:00
Eric Fischer
8ed427e9f5 cache list of partitions in a course 2018-04-26 13:10:19 -04:00
Matthew Piatetsky
034ad193da Fix refundable status for audit orders 2018-04-26 12:42:44 -04:00
Brittney Exline
51d632531c Merge pull request #18055 from edx/bexline/empty_sso_verification_migration 
ENT-969: Partial revert of "ENT-945 Update IDVerification interfaces to account for SSOVerification"
 2018-04-26 08:54:34 -06:00
Jae Bradley
b9092c80e1 Merge pull request #18059 from edx/cookie-policy-banner-1.1.6 
Upgrade cookie policy banner version to 1.1.6
 2018-04-26 10:19:14 -04:00
jaebradley
9bb383a0c9 upgrade cookie policy banner version 2018-04-26 09:43:54 -04:00
adeel khan
b996a23712 Merge pull request #17973 from edx/adeel/learner_4344_catch_httperror_exception_thrown_psa 
Catch HttpError thrown by Python Social Auth.
 2018-04-26 15:00:14 +05:00
Adeel Khan
cd2f6592c3 Catch HttpError thrown by Python Social Auth. 
This patch enables catching HttpError exception raised
by PSA because of any issue caused at client/server.
Further it redirects user to login page with a
message about the error.

LEARNER-4344
 2018-04-26 13:02:38 +05:00
Feanil Patel
c242babb08 Merge pull request #18056 from edx/feanil/remove_flaky_test 
Remove this flaky test.
 2018-04-25 17:04:57 -04:00
Jeremy Bowman
9477ad23d1 TE-2528 Upgrade testing dependencies 2018-04-25 16:37:29 -04:00
Gabe Mulley
cc5f7d7a32 fix pylint 2018-04-25 16:33:05 -04:00
Feanil Patel
6df0cdf646 Remove this flaky test. 2018-04-25 16:20:11 -04:00
Michael Roytman
a1caa609a4 Merge pull request #18054 from edx/mroytman/bump-studio-frontend-1.8.0 
update studio-frontend version to 1.8.0
 2018-04-25 16:17:34 -04:00
sanfordstudent
6df9f452bf Merge pull request #18053 from edx/sstudent/cache_discussion_context 
request cache some more stuff
 2018-04-25 16:11:17 -04:00
Eric Fischer
23c9bada44 Merge pull request #18050 from edx/efischer/quick_fix 
Optimize dictionary combination
 2018-04-25 16:10:30 -04:00
Brittney Exline
292f9ca831 Partial revert of "ENT-945 Update IDVerification interfaces to accountfor SSOVerification" 
This partially reverts commit ee1c3a4548.
The migration files introduced by the commit have been kept since they have been run
already on several enviornments.
 2018-04-25 16:01:15 -04:00
Sanford Student
2f0e3d35a0 EDUCATOR-2618 request cache some more stuff 2018-04-25 15:33:44 -04:00