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

50105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Tuchfarber
e4430b0dfb Merge pull request #20882 from edx/tuchfarber/add_site_check_to_consent 
Check if enterprise matches site before consent
 2019-06-24 15:43:28 -04:00
Matt Tuchfarber
4e1877670e Check if enterprise matches site before consent 
We don't support enterprises with catalogs that span sites, so we can
safely ignore checking for consent when the site a learner is viewing a
course in is different than the enterprise that the learner is linked
to.
 2019-06-24 14:30:59 -04:00
Dave St.Germain
5f838da9be Merge pull request #20881 from edx/dcs/prod-344 
Ensure that exam due dates reflect course pacing
 2019-06-24 14:26:30 -04:00
Jeremy Bowman
50a2641e1c Remove flaky problem reset tests (#20870) 2019-06-24 13:20:50 -04:00
Dave St.Germain
15921ebe65 Ensure that exam due dates reflect course pacing 2019-06-24 12:03:50 -04:00
Christie Rice
eeb265e276 REVEM-376 Disable waffle flags by default (#20880) 2019-06-24 11:31:10 -04:00
Manjinder Singh
eb5e44c2d1 Merge pull request #20841 from edx/msingh/removing_flacky_test 
Removing flaky tests
 2019-06-24 11:10:23 -04:00
Christie Rice
b8401beaae REVEM-374 Remove course prices from dashboard (#20856) 2019-06-24 08:56:05 -04:00
Mushtaq Ali
07addf5f22 Merge pull request #20853 from edx/mushtaq/fix-csrf-referer-not-trusted 
Add CSRF_TRUSTED_ORIGINS settings
 2019-06-24 16:18:10 +05:00
Syed Muhammad Dawoud Sheraz Ali
257406b25b Merge pull request #20859 from edx/dsheraz/prod-136 
remove staff exemption from the library_content transformer
 2019-06-24 11:33:55 +05:00
DawoudSheraz
b37e679c39 remove staff exemption from the library_content transformer 2019-06-24 11:05:11 +05:00
edX Transifex Bot
b824f583c5 fix(i18n): update translations 2019-06-23 17:22:25 -04:00
Calen Pennington
14f7b90fb8 Merge pull request #20872 from cpennington/track-selection-not-enrolled 
Add metrics and logging around track selection rendering without enro…
 2019-06-21 15:42:25 -04:00
Douglas Hall
f9d599a1a0 Add Discover New link to LMS header. (#20875) 2019-06-21 15:41:06 -04:00
jansenk
027a9bd2cc add api access request management command 2019-06-21 15:34:03 -04:00
Stu Young
16fcf22a7c bump code annotations (#20869) 2019-06-21 13:56:49 -04:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Calen Pennington
b14244fe01 Merge pull request #20862 from cpennington/mobile-fbe-fields 
Allow a limited subset of fields in the Course Block View for blocks …
 2019-06-21 12:25:56 -04:00
Manjinder Singh
a787cd51cf Merge pull request #20801 from edx/msingh/INCR-482 
INCR-482: ran python modernization and isort
 2019-06-21 11:10:37 -04:00
Andytr1
cac4ec0047 Merge pull request #20843 from edx/andytr1/grades_show_email_for_masters_track_only 
EDUCATOR-4319 gradebook show student email only for master's track.
 2019-06-21 09:29:58 -04:00
Amit
df949d6de1 INCR-480: Make compatible with Python 3.x and fixed line over length limit (#20833) 2019-06-20 16:20:49 -04:00
Amit
4fb5679987 INCR-245: Make compatible with Python 3.x without breaking Python 2.7… (#20530) 
* INCR-245: Make compatible with Python 3.x without breaking Python 2.7 support > common/lib/capa/capa/safe_exec

* INCR-245: Add absolute_import to CODE_PROLOG
 2019-06-20 15:38:33 -04:00
Calen Pennington
093fc9f68a Allow a limited subset of fields in the Course Block View for blocks that have been denied authorization 2019-06-20 15:23:32 -04:00
atesker
68ec2e184d gradebook show student email only for master's track. 
gradebook show student email only for master's track.

show emails for masters track - unit tests pass

fixed more unit tests and linting
 2019-06-20 14:51:38 -04:00
edX cache uploader bot
23196519b3 Updating Bokchoy testing database cache (#20863) 2019-06-20 11:35:39 -04:00
edX requirements bot
a8310f34c7 Updating Python Requirements (#20860) 2019-06-20 11:29:46 -04:00
Hassan
e6fc882cee Merge pull request #20847 from edx/hassan/add-history-to-coursemode 
Added history to CourseMode.
 2019-06-20 19:49:02 +05:00
Hassan Javeed
6d14f288e5 Added history to CourseMode 
DE-1557
 2019-06-20 19:04:26 +05:00
msingh
403a04b9fa Removing flacky test from test_lms_problems.py 2019-06-20 09:25:40 -04:00
Usama Sadiq
d5a8a40a3a Merge pull request #20861 from edx/usama/INCR-476 
INCR-476
 2019-06-20 18:12:36 +05:00
usama sadiq
1630911131 Updated to Python3 
Added absolute import in both files
 2019-06-20 16:07:17 +05:00
edX cache uploader bot
392cc97ce9 Updating Bokchoy testing database cache (#20839) 2019-06-19 11:01:41 -04:00
Feanil Patel
d399364021 Merge pull request #20851 from edx/jenkins/upgrade-python-requirements-5414828 
Python Requirements Update
 2019-06-19 10:10:15 -04:00
Feanil Patel
eddcb87ea1 Merge pull request #20814 from amitvadhel/INCR-477 
INCR-477: Make compatible with Python 3.x
 2019-06-19 09:43:26 -04:00
edx-pipeline-bot
e61b1c7b9a Merge pull request #20832 from edx/private_to_public_319d54e 
Mergeback PR from private to public.
 2019-06-19 18:20:33 +05:00
Waheed Ahmed
e311dc2e4c Merge pull request #20849 from edx/geoip2-bot-update-country-database2019-06-19 
geoip2: update maxmind geolite country database
 2019-06-19 16:15:36 +05:00
Mushtaq Ali
d9a67496ff Add CSRF_TRUSTED_ORIGINS settings to successfully make POST requests from edx-learner-portal to edx-platform - ENT-2025 2019-06-19 16:04:24 +05:00
edX requirements bot
e596499c3e Updating Python Requirements 2019-06-19 06:48:23 -04:00
edX Transifex Bot
82f48ec1df geoip2: update maxmind geolite country database 2019-06-19 09:43:35 +00:00
DawoudSheraz
5747e97895 Merge branch 'master' into private_to_public_319d54e 2019-06-19 11:22:07 +05:00
amitvadhel
05bf848b1f INCR-477: pylint: disable import-error for urljoin 2019-06-19 09:16:03 +03:00
amitvadhel
94f410f432 INCR-477: Make compatible with Python 3.x 2019-06-19 08:35:43 +03:00
Bessie Steinberg
5414828c00 Merge pull request #20845 from edx/bessiesteinberg/bump-edx-enterprise-to-1.6.15 
Bump edx-enterprise to 1.6.15
 2019-06-18 17:00:55 -04:00
Feanil Patel
e4bb4b0959 Merge pull request #20823 from edx/renovate/npm-underscore.string-vulnerability 
Update dependency underscore.string to v3.3.5 [SECURITY]
 2019-06-18 15:44:06 -04:00
Bessie Steinberg
bb2ba6e2a3 Bump edx-enterprise to 1.6.15 2019-06-18 15:14:05 -04:00
Feanil Patel
11895b843f Run npm install with our version of node. 2019-06-18 14:39:49 -04:00
Calen Pennington
92d9a1f541 Merge pull request #20789 from cpennington/first-enroll-discount-strikeout 
Add strike-out price to LMS Course Home sidebar
 2019-06-18 13:02:15 -04:00
Calen Pennington
2901d5f810 Centralize the strike-out price formatting to make correct accessibility easier 2019-06-18 11:00:08 -04:00
Zainab Amir
f55407a48d Merge pull request #20734 from edx/zamir/LEARNER_6220_remove_remember_me_button 
Remove Remember me button from login page
 2019-06-18 17:57:09 +05:00
Zainab Amir
fa8aeb69d9 Remove Remember me button from login page 
Remember me button does the same thing regardless of if it is checked
or not. Remember me button being unchecked makes a user think they
will be logged out at the end of a browsing session when this is in
fact not the case

LEARNER-6220
 2019-06-18 17:30:37 +05:00