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

45971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
0cd4f578ad Merge pull request #18100 from edx/schen/EDUCATOR-2695 
Create deletion method for the PendingNameChange model to comply with GDPR
 2018-05-01 15:01:46 -04:00
Simon chen
803a396e11 Create deletion method for the PendingNameChange model to comply with GDPR 2018-05-01 14:21:41 -04:00
Stu Young
04d3e9b9af Merge pull request #18094 from edx/testeng/bokchoy_auto_cache_update_f18a9d4e742f5e646d6176a845c96988e0240754 
Bokchoy db cache update
 2018-04-30 17:01:10 -04:00
edx-cache-uploader-bot
82ac53a4de Updating db cache 2018-04-30 16:25:16 -04:00
Brittney Exline
5b19309691 Merge pull request #18070 from edx/bexline/sso_id_verification2 
ENT-945 Using SSOVerifications in ID Verification flow
 2018-04-30 14:14:03 -06:00
Rabia Iftikhar
c69faad9a8 Merge pull request #18074 from edx/ri/EDUCATOR-2774-certificate-eligible-column 
EDUCATOR-2774 add new condition for cert eligible column in grade report
 2018-05-01 00:35:44 +05:00
J Eskew
09be730861 Merge pull request #18090 from edx/jeskew/fix_retirement_queue_method 
Process states param to gather all passed-in states.
 2018-04-30 15:01:34 -04:00
rabiaiftikhar
c51d121faa EDUCATOR-2774 add new condition for cert eligible column in grade report 2018-04-30 23:43:31 +05:00
sanfordstudent
1f490a66c1 Merge pull request #18065 from edx/sofiya/ed2770 
EDUCATOR-2770: Update logout endpoint to accept requests from user and validate password
 2018-04-30 14:24:14 -04:00
Simon Chen
4efd355ba7 Merge pull request #18091 from edx/schen/EDUCATOR-2698 
Implement retire users function in the SurveyAnswer model for GDPR
 2018-04-30 14:17:03 -04:00
John Eskew
891b9a64de Add a test for multiple learner states. 2018-04-30 13:38:29 -04:00
Simon Chen
174c01759f Implement retire users function in the SurveyAnswer model for GDPR 2018-04-30 13:07:32 -04:00
Gregory Martin
75f94f9735 Merge pull request #18079 from edx/yro/EDUCATOR-2700-B 
Update models to 'Retire' not delete data
 2018-04-30 12:51:41 -04:00
jaebradley
d360c29714 EDUCATOR-2770: Update logout endpoint 2018-04-30 12:50:49 -04:00
Matthew Piatetsky
507100b738 Merge pull request #18081 from edx/exclude_instructors_from_paywall 
add has_staff_access to course metadata
 2018-04-30 12:27:42 -04:00
John Eskew
e7bdbe6846 Process states param to gather all passed-in states. 2018-04-30 12:21:53 -04:00
Brittney Exline
91e63ed8e0 ENT-945 Using SSOVerifications in ID Verification flow 
This reworks what was done #17930, since it had to be reverted from the IDVerificationAggregate migration.
We decided to abandon that model and directly read from both id verification models.
 2018-04-30 11:57:59 -04:00
Matthew Piatetsky
27c7a55b55 add has_staff_access to course metadata 2018-04-30 11:49:37 -04:00
Gregory Martin
16a5555c7e Update models to 'Retire' not delete data 
EDUCATOR-2700
 2018-04-30 10:45:08 -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