Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

25379 Commits

Author SHA1 Message Date
Calen Pennington
4069594b19 Merge pull request #20250 from cpennington/bridgekeeper-adr 
Write up Bridgekeeper proposal for permissions
 2019-04-22 10:04:03 -04:00
Diana Huang
4a61e6bb70 Remove references to microsites in bulk enroll. 2019-04-22 09:25:39 -04:00
Zainab Amir
da27f244f0 Update edx.org theme to add new css rule 
* To make language selection button in footer consistent
with the edx.org theme, add new css rule
* Remove unused event from select element

LEARNER-1338
 2019-04-22 14:15:16 +05:00
Jansen Kantor
fbf699b915 Merge pull request #20270 from edx/jkantor/program-course-enroll 
add ProgramCourseEnrollment
 2019-04-19 16:18:48 -04:00
jansenk
0622c69d75 add ProgramCourseEnrollment 2019-04-19 12:56:50 -04:00
Matt Hughes
1070ba0236 WIP: Remove misleading copy for Master's-only courses' course pages' 
Logged out learners shouldn't be lead to believe they'll be able to
enroll themselves into such courses, which we're worried they may've
read into the existing copy

JIRA:EDUCATOR-4158
 2019-04-19 10:30:24 -04:00
Calen Pennington
f18fc1e7aa Expose will_recheck_access further up the LMS xblock stack 2019-04-18 14:58:15 -04:00
Michael Youngstrom
7ddb806135 Merge pull request #20223 from edx/youngstrom/deprecate-lettuce 
Remove lettuce infrastructure
 2019-04-18 11:54:57 -04:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00
Zainab Amir
ab7fef23b1 Add language selection button in footer 
In the footer added a button to the right of lang selection dropdown
which reloads the page once it's clicked.
 2019-04-18 17:12:49 +05:00
Zainab Amir
e36b3d14b0 Edit verificationexpiry email template 
The changes adds line breaks in email template

LEARNER-5408
 2019-04-18 14:18:04 +05:00
Zainab Amir
d39b150d3b Fix Flaky test in TestSendVerificationExpiryEmail 
datetime.now(UTC) gives unexpected results. Using "now()" function
from django.utils.timezone tends to be a much more reliable way to
get a time zone aware timestamp for the current time.

PROD-190
 2019-04-18 10:55:48 +05:00
Josue Balandrano Coronel
13b4c452fa Add capability to override MANUAL_ENROLLMENT_ROLE_CHOICES from lms.env.json 2019-04-17 14:34:45 -05:00
Christie Rice
32edefb425 REVEM-306 Remove experiments.add_program_price flag (#20259) 2019-04-17 15:26:08 -04:00
Matthew Piatetsky
44bad70b2c Merge pull request #20238 from edx/REVMI-149 
[REVMI-149] remove experiment code
 2019-04-17 13:57:01 -04:00
Ned Batchelder
7d964b12db Context managers need to clean up properly 
An @contextmanager will raise an exception from its yield statement if
an exception happens in the with-block that uses it.  If the context
manager needs to do clean up, it should do it even if an exception is
raised, so it needs to be done in a finally clause.
 2019-04-17 13:14:48 -04:00
Christie Rice
9c1141c99d REVEM-305 Change default value of experiment flags to true (enabled) (#20242) 2019-04-17 12:22:53 -04:00
Michael Roytman
93ce716327 Merge pull request #20201 from edx/mroytman/EDUCATOR-4159-masters-only-logged-in 
remove enroll CTA on course homepage for logged out users visiting a …
 2019-04-17 11:12:26 -04:00
Matthew Piatetsky
5ef9cf3d49 remove experiment code 2019-04-17 09:30:47 -04:00
Jeremy Bowman
cd2e58e093 DEPR-16 Stop using deprecated OpaqueKey methods (#20248) 2019-04-16 17:59:16 -04:00
Michael Roytman
f7d0753210 remove enroll CTA on course homepage for logged out users visiting a Master's only course 2019-04-16 16:05:56 -04:00
Calen Pennington
35a20d0e48 Write up Bridgekeeper proposal for permissions 2019-04-16 14:10:43 -04:00
Richard I Reilly
f468cf2208 Merge pull request #20135 from edx/rir/addProgramEnrollments 
Add ProgramEnrollment app and model for masters
 2019-04-16 10:28:54 -04:00
Matthew Piatetsky
62b9bb89c8 Change content_type_gating enabled_for_enrollment to return false if a course has no verified mode or a user is not enrolled in the audit mode 2019-04-14 16:32:13 -04:00
Rick Reilly
2bf3e6621e Add ProgramEnrollment app and model for masters 2019-04-12 15:50:30 -04:00
albemarle
05a682f55e use new, shorter names for feature toggle annotations (#20202) 2019-04-12 15:46:09 -04:00
Calen Pennington
484d916627 Merge pull request #20218 from cpennington/fbe-improve-support-form 
Show complete reason on both content type gating and course duration …
 2019-04-12 11:41:33 -04:00
Nimisha Asthagiri
aaa7b20654 Merge pull request #20126 from edx/depr/mobile-video-outline-api 
DEPR-4: Remove Mobile Video Outlines API
 2019-04-12 08:37:17 -04:00
Zainab Amir
fabaf9e8d9 Merge pull request #20217 from edx/zamir/LEARNER_7045_update_compiled_translation_strings 
LEARNER-7045 Update compiled translation strings
 2019-04-12 11:56:40 +05:00
Calen Pennington
446db3ac53 Show complete reason on both content type gating and course duration limits in support form 2019-04-11 12:33:58 -04:00
Farhanah Sheets
fe4679fc04 Merge pull request #20206 from edx/waheed/PROD-174-fix-social-auth-buttons 
Fix Facebook and Google social auth buttons.
 2019-04-11 10:25:41 -04:00
Zainab Amir
c6789ac4a9 Update compiled translation strings 
Currently the pull_translation job does not compile the js/jsx
strings. To update the .mo files correctly and reflect the translated
strings on prod the command paver i18n_dummy was run.

LEARNER-7045
 2019-04-11 17:51:51 +05:00
Waheed Ahmed
159685b2b2 Fix Facebook and Google social auth buttons. 
Facebook emailed that edX doesn't comply with Platform Policy 8.3, also fixed
Google button according to their policy.

PROD-174
 2019-04-11 17:25:06 +05:00
Nimisha Asthagiri
dbde017a9b Order History: Toggled redirection to Microfrontend 
ARCH-641
 2019-04-11 08:21:49 -04:00
noraiz-anwar
eeb89c457d pass grade feeze info to xblocks 2019-04-10 19:21:26 +05:00
irfanuddinahmad
5cb8d7a4ce ENT-1784-SYSTEM_TO_FEATURE_ROLE_MAPPING-setting 2019-04-10 15:24:14 +05:00
Matthew Piatetsky
51b991c128 fix bug and add temporary waffle flag 2019-04-09 15:38:55 -04:00
Matthew Piatetsky
064f041276 Revert "Revert both" 2019-04-09 11:04:10 -04:00
David Ormsbee
c8532c16dd Merge pull request #20084 from jolyonb/examfix 
Hiding overall grades in progress page for a sequential when problem scores are hidden
 2019-04-09 09:37:11 -04:00
Chris Pappas
a0332148f4 Merge pull request #20170 from edx/cpappas/ENT-1556-tweaks 
ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES f…
 2019-04-08 13:27:41 -04:00
Matthew Piatetsky
be9eb46364 Revert "handle missing fields on access denied blocks" 
This reverts commit 418540b713.
 2019-04-08 12:13:30 -04:00
Zainab Amir
490a62c447 Merge pull request #20180 from edx/zamir/LEARNER_5408_get_current_site_object 
LEARNER-5408 Get current site by ID
 2019-04-08 15:55:29 +05:00
Muhammad Ammar
07696ef5dd Merge pull request #20122 from edx/ammar/add-default-settings-for_system_wide_role_classes 
add default settings for system_wide_role_classes
 2019-04-08 13:41:34 +05:00
Zainab Amir
2471c12cc4 Get current site by ID 
Getting current site by NAME was failing on stage.

LEARNER-5408
 2019-04-08 12:54:34 +05:00
Hammad Ahmad Waqas
3955dab574 Merge pull request #20164 from edx/hammad/WL-1905 
WL-1905 |  Some learners not showing up in report | Missing Data Sharing Consent Redirection
 2019-04-08 12:39:43 +05:00
muhammad-ammar
1a4de0a85d add default settings for system_wide_role_classes 2019-04-08 11:11:59 +05:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected 
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
 2019-04-05 17:27:13 -04:00
Alan Zarembok
f9a5d93ce4 PROD-101: Do not rewrite URL for videos that do not have a video id. 2019-04-05 15:29:17 -04:00
Dave St.Germain
5b8c5d4500 Master's certs will automatically be generated 2019-04-05 12:02:38 -04:00
Dave St.Germain
66744598df Master's track will result in a verified cert 2019-04-05 12:02:38 -04:00