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

49305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DawoudSheraz
0a690c31a3 remove mathjax autocollapse feature 2019-04-23 12:33:54 +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
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
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
Jeremy Bowman
5424155cd0 TE-2861 Use correct version of Django in tests (#20271) 2019-04-19 10:44:41 -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
adeelehsan
e99c3852b3 geoip2: update maxmind geolite country database 2019-04-19 16:25:48 +05:00
Jeremy Bowman
34a0bd91e8 TE-2850 Resume RTD doc builds (#19910) 2019-04-18 15:41:13 -04:00
Calen Pennington
f18fc1e7aa Expose will_recheck_access further up the LMS xblock stack 2019-04-18 14:58:15 -04:00
Matt Hughes
fa4e3923e5 Merge pull request #20262 from edx/matthugs/safari-popup-blocking-user-confusion-proctoring 
Mitigate learner confusion around blocked popups in proctoring flow
 2019-04-18 13:57:28 -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
edX requirements bot
31e4315ef4 Updating Python Requirements (#20267) 2019-04-18 11:47:23 -04:00
Michael Youngstrom
a8058f71c6 Merge pull request #20268 from edx/youngstrom/fix-slack 
Fix slack messaging in pipelines
 2019-04-18 11:44:35 -04:00
Zainab Amir
4026e2f825 Merge pull request #20233 from edx/zamir/LEARNER_1338_add_button_for_lang_choice 
Add language selection button in footer
 2019-04-18 20:02:53 +05:00
Michael Youngstrom
640ff4ed10 Fix slack messaging in pipelines 2019-04-18 10:56:01 -04:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00
Christie Rice
e00dbe6484 Remove flaky test LMSLanguageTest.test_lms_language_change (#20264) 2019-04-18 08:43:54 -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
Ned Batchelder
4ea60d637f Merge pull request #20256 from edx/nedbat/no-authors 
No need to maintain AUTHORS
 2019-04-18 06:46:21 -04:00
Zainab Amir
83db220064 Merge pull request #20252 from edx/zamir/LEARNER_5408_edit_verificationexpiry_email_template 
Edit verification expiry email template
 2019-04-18 15:04:28 +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
cc7bb4df7e Merge pull request #20234 from edx/zamir/PROD_190_fix_SendVerificationExpiryEmail_flaky_tests 
Fix Flaky test in TestSendVerificationExpiryEmail
 2019-04-18 11:44: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
Christie Rice
32edefb425 REVEM-306 Remove experiments.add_program_price flag (#20259) 2019-04-17 15:26:08 -04:00
Matt Hughes
7961604d0e Mitigate user confusion around blocked popups in proctoring flow 
JIRA:EDUCATOR-4242
 2019-04-17 15:07:07 -04:00
Matt Drayer
1375b3d67f Merge pull request #20261 from edx/mattdrayer/ENT-1748-fix 
Bump to edx-enterprise v1.4.7
 2019-04-17 14:30:00 -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
3328fec9cc Merge pull request #20260 from edx/nedbat/context-managers-need-finally 
Context managers need to clean up properly
 2019-04-17 13:56:23 -04:00
Matt Drayer
38df181a95 Bump to edx-enterprise v1.4.7 2019-04-17 13:42:02 -04:00
Michael Youngstrom
1bd29a5be0 Merge pull request #19960 from edx/youngstrom/axe-core 
Upgrade axe-core (via bok-choy) to 3.2.2
 2019-04-17 13:29:22 -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 Youngstrom
a87273ec01 Upgrade axe-core and ignore newly introduced failures 2019-04-17 12:18:32 -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
Ned Batchelder
c932555339 No need to maintain AUTHORS 2019-04-17 10:36:09 -04:00
Matthew Piatetsky
5ef9cf3d49 remove experiment code 2019-04-17 09:30:47 -04:00
Waheed Ahmed
fd6170f2d5 Merge pull request #20253 from edx/waheed/LEARNER-5258-message-updates 
Update third party auth login page message.
 2019-04-17 16:58:26 +05:00
Waheed Ahmed
3bdf83dba7 Update third party auth login page message. 
LEARNER-5258
 2019-04-17 15:20:38 +05:00