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

20747 Commits

Author SHA1 Message Date
Dave St.Germain
589bd9b660 Merge pull request #20121 from edx/dcs/add-edx-when 
Add edx-when
 2019-04-25 10:00:57 -04:00
Alan Zarembok
30b9692915 PROD-9: Fix badly performing database query for bulk email by using 
the union() function to combine multiple querysets together, rather
than the or (|) operator.  This avoids a very inefficient OUTER
JOIN query that reads the entire user table.
 2019-04-25 08:55:59 -04:00
Zainab Amir
34c08a4ac2 update class to fix footer lang button for firefox 2019-04-25 15:52:07 +05:00
Guruprasad Lakshmi Narayanan
73ab30e342 Fix the order randomization behaviour of Randomized Content Block 
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
 2019-04-25 10:23:46 +05:30
Dave St.Germain
42ede57383 Hide edx-when feature behind waffle flag 2019-04-24 16:36:56 -04:00
Alex Dusenbery
bf661eaa8d Add unique constraint to ProgramEnrollment model 2019-04-24 13:47:23 -04:00
Dave St.Germain
b4ccd03740 This adds a new django app -- edx-when -- that will copy start and due dates to mysql and allow per-learner overrides in the instructor dashboard, using the existing IDDE interface. 
It adds a data migration for existing IDDE data.
 2019-04-24 12:26:19 -04:00
Waheed Ahmed
ff07b3057e Merge pull request #20308 from edx/waheed/PROD-225-fix-account-settings-lang-selection 
Fix account settings page language selection.
 2019-04-24 20:01:03 +05:00
Zach Hancock
afe3cdb3ec user lookup util 2019-04-24 09:47:38 -04:00
Waheed Ahmed
322fca2c6f Fix account settings page language selection. 
Fixed generating transifex URL for two character language codes.

PROD-225
 2019-04-24 18:25:59 +05:00
Zainab Amir
e0296b373c Update the compiled js and jsx strings 
Right now pull_translations job does not compile the js and jsx
strings automatically, so manually added them here.

LEARNER-7045
 2019-04-24 12:18:20 +05:00
asadazam93
5a5c3fd79e Don't include invisible, graded subsections in grade reports. 2019-04-23 14:23:29 -04:00
Ned Batchelder
2171ddb9df URL patterns should be anchored. SEC-367 
Some notes:

* The completion API was pulled out into a new repo, but left behind a
  url() entry.  That entry used a different namespace than the
  pulled-out repo, so I had to fix the one place we used the namespace.

* Two urls couldn't be anchored because they broke tests:

    url(r'users/(?P<user_id>\w+)/followed$', views.followed_threads, name='followed_threads'),
    url(r'users/(?P<user_id>\w+)$', views.user_profile, name='user_profile'),
 2019-04-23 09:19:23 -04:00
Zainab Amir
255583874f Merge pull request #20283 from edx/zamir/LEARNER_1338_add_css_rule_to_edx_theme 
Update edx.org theme to add new css rule
 2019-04-23 11:40:46 +05:00
Jansen Kantor
d378260d48 Merge pull request #20284 from edx/jkantor/prog-course-enroll-admin 
add program course enrollment admin
 2019-04-22 14:35:25 -04:00
Matt Hughes
2dc19c4139 Merge pull request #20263 from edx/matthugs/EDUCATOR-4158-logged-out-course-page-masters-only-courses 
Remove misleading copy for Master's-only courses' course pages'
 2019-04-22 11:02:59 -04:00
Diana Huang
d4ea154945 Merge pull request #20276 from edx/diana/remove-microsites-bulkenroll 
Remove references to microsites in bulk enroll.
 2019-04-22 10:13:01 -04:00
jansenk
8389702765 add program course enrollment admin 2019-04-22 10:05:36 -04:00
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