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

49340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
e3e009df8c Merge pull request #20312 from cocococosti/INCR-162 
INCR-162
 2019-04-25 10:48:10 -04:00
David Ormsbee
0de369a4e3 Merge pull request #20095 from stvstnfrd/sysadmin/version 
Remove unused version from footer
 2019-04-25 10:23:42 -04:00
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
Jolyon Bloomfield
c3717cbf7f INCR-201 Migrate common/djangoapps/terrain/stubs (#20163) 2019-04-24 17:03:21 -04:00
Michael Youngstrom
d0601d3b49 Merge pull request #20294 from edx/youngstrom/INCR-115 
INCR-115
 2019-04-24 16:38:56 -04:00
Dave St.Germain
42ede57383 Hide edx-when feature behind waffle flag 2019-04-24 16:36:56 -04:00
Constanza Abarca
f88061a3b3 ran isort 2019-04-24 15:14:34 -04:00
Michael Youngstrom
3b7f588b09 Merge pull request #20313 from edx/testeng/bokchoy_auto_cache_update_800b4f35c750b86e61ac2869d8470404b6821343 
Bokchoy Testing DB Cache update
 2019-04-24 14:52:57 -04:00
edX cache uploader bot
d2ffe38733 Updating Bokchoy testing database cache 2019-04-24 13:59:35 -04:00
Alex Dusenbery
bf661eaa8d Add unique constraint to ProgramEnrollment model 2019-04-24 13:47:23 -04:00
Constanza Abarca
0abba0e6f8 INCR-162 2019-04-24 13:44:27 -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
Michael Youngstrom
353d006839 INCR-115 2019-04-24 11:07:37 -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
Michael Youngstrom
1dca07a237 Merge pull request #20309 from edx/testeng/bokchoy_auto_cache_update_33892bde4eb35bafb7ab095ab7be63c091630c32 
Bokchoy Testing DB Cache update
 2019-04-24 10:44:36 -04:00
Matthew Piatetsky
c324b54d58 Merge pull request #20273 from edx/REVMI-152 
allow overriding FBE group access restrictions for problems at the unit level
 2019-04-24 10:18:23 -04:00
edX cache uploader bot
afc3d097ac Updating Bokchoy testing database cache 2019-04-24 09:58:15 -04:00
Zach Hancock
afe3cdb3ec user lookup util 2019-04-24 09:47:38 -04:00
Michael Youngstrom
03db25bd50 Merge pull request #20278 from edx/youngstrom/INCR-189 
INCR-189
 2019-04-24 09:36:22 -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
df5a1b0aae Merge pull request #20307 from edx/zamir/LEARNER_7045_update_compiled_js_and_jsx_strings 
LEARNER-7045: Update the compiled js and jsx strings
 2019-04-24 14:06:00 +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
edX Transifex Bot
0228822e5d fix(i18n): update translations 2019-04-24 02:54:25 -04:00
Stu Young
4347b66d74 Merge pull request #20301 from edx/estute/fix-migrations 
add missing course_key to migrations for bokchoy
 2019-04-23 16:25:04 -04:00
asadazam93
5a5c3fd79e Don't include invisible, graded subsections in grade reports. 2019-04-23 14:23:29 -04:00
Stuart Young
6a8de2b049 add missing course_key to migrations for bokchoy 2019-04-23 13:35:50 -04:00
Matthew Piatetsky
6c2c896ec3 allow overriding FBE group access restrictions for problems at the unit level 2019-04-23 11:31:41 -04:00
Farhanah Sheets
027a45b4f4 Merge pull request #20297 from edx/dsheraz/prod-167 
remove mathjax autocollapse feature
 2019-04-23 10:07:50 -04:00
edX requirements bot
601d9b326f Updating Python Requirements (#20299) 2019-04-23 09:56:50 -04:00
edX Transifex Bot
9bd439e691 fix(i18n): update translations 2019-04-23 07:08:34 -04:00
DawoudSheraz
643db20c74 extra space removed 2019-04-23 12:43:29 +05:00
DawoudSheraz
0a690c31a3 remove mathjax autocollapse feature 2019-04-23 12:33:54 +05: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
Michael Youngstrom
2613aa703b INCR-189 2019-04-22 15:55:16 -04: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
Michael Youngstrom
5d77bc7bcc Merge pull request #20280 from edx/jenkins/upgrade-python-requirements-0ba017f 
Python Requirements Update
 2019-04-22 11:28: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
Hammad Ahmad Waqas
26ef549941 Merge pull request #20232 from edx/hammad/WL-1913 
WL-1913 | sync_hubspot_contacts Jenkins job disabled due to OOM
 2019-04-22 16:56:07 +05: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
Hammad Ahmad Waqas
90a8c3fd20 using generators instead of list for sync_hubspot_contact command to 
handle OOM issues
 2019-04-22 11:46:38 +05:00
edX requirements bot
72d16b9b93 Updating Python Requirements 2019-04-20 06:52:16 -04:00
Michael Youngstrom
0ba017f39b Merge pull request #20277 from edx/testeng/bokchoy_auto_cache_update_012232f37fe118dfd86bd24e23be782eceb16348 
Bokchoy Testing DB Cache update
 2019-04-19 22:53:30 -04:00
edX cache uploader bot
4a0256dcc6 Updating Bokchoy testing database cache 2019-04-19 16:31:37 -04:00
Jansen Kantor
fbf699b915 Merge pull request #20270 from edx/jkantor/program-course-enroll 
add ProgramCourseEnrollment
 2019-04-19 16:18:48 -04:00
Calen Pennington
5d99714aed Merge pull request #20272 from cpennington/revmi-34-recheck-access 
Expose will_recheck_access further up the LMS xblock stack
 2019-04-19 13:51:37 -04:00
jansenk
0622c69d75 add ProgramCourseEnrollment 2019-04-19 12:56:50 -04:00