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

45937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Michael LoTurco
8847059021 Merge pull request #18049 from edx/mloturco/learner-4715 
retrap focus for seat unenroll survey a11y

learner-4715
 2018-04-25 15:32:59 -04:00
Eric Fischer
27e309f147 Optimize dictionary combinations 2018-04-25 15:30:17 -04:00
Eric Fischer
c724b1b0a4 Merge pull request #18052 from edx/efischer/cache_stuff 
Cache get_group_id_for_user
 2018-04-25 15:18:09 -04:00
Michael Roytman
c54223e2e6 update studio-frontend version to 1.8.0 2018-04-25 15:10:09 -04:00
Michael LoTurco
62ae6d4555 retrap focus for seat unenroll survey a11y 
learner-4715
 2018-04-25 14:51:35 -04:00
Jeff LaJoie
bb026ff878 Merge pull request #18010 from edx/jlajoie/LEARNER-4700 
LEARNER-4700: Converts credentials to plugin
 2018-04-25 14:43:21 -04:00
Eric Fischer
30476a338f Stop hitting mongo so much, cache this result 2018-04-25 14:18:17 -04:00
Gabe Mulley
aa261ba9d9 add tests 2018-04-25 13:04:09 -04:00
Albert (AJ) St. Aubin
ee1eaaf243 Merge pull request #18024 from edx/aj/LEARNER-4913_is_anon 
Updates to use the is_anonymous flag of basket calculate
 2018-04-25 12:22:53 -04:00
Albert St. Aubin
213673db61 Updates to use the is_anonymous flag of basket calculate 
[LEARNER-4913]
 2018-04-25 11:42:53 -04:00
Jeff LaJoie
29748877de LEARNER-4700: Converts credentials to plugin 2018-04-25 11:32:33 -04:00
Brian Mesick
1828bf7d6b Merge pull request #17920 from edx/bmedx/fix_retirement_apis 
Update retirement APIs to match spec
 2018-04-25 10:39:26 -04:00
AlasdairSwan
321a1acb04 Merge pull request #17945 from edx/alasdair/LEARNER-4880-gdpr-modal-display 
LEARNER-4880 added confirmation modal for account deletion
 2018-04-24 16:40:07 -04:00
Gregory Martin
d8a005359e Merge pull request #17998 from edx/yro/EDUCATOR-2700 
Yro/EDUCATOR 2700
 2018-04-24 16:38:44 -04:00
Gregory Martin
9b6a15619e Unlink SoftwareSecure PII for GDPR 2018-04-24 15:58:59 -04:00