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

45098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
f4e9f3ac2d Revert "Made the certificates section on the user profile page site aware. WL-1289" 2018-02-13 11:43:33 -05:00
Michael Roytman
7fc5a78528 Merge pull request #17457 from edx/mroytman/EDUCATOR-1613-i18n 
pass language to mako template
 2018-02-13 09:58:00 -05:00
Dennis Jen
20349e88bd Merge pull request #17160 from open-craft/tomaszgy/fix_layout_of_enrollment_in_ccx_dashboard 
Simplify layout of the Enrollment tab of CCX dashboard
 2018-02-13 09:39:58 -05:00
Afzal Wali Naushahi
69a3e1115b Merge pull request #17164 from edx/afzaledx/WL-1289 
Made the certificates section on the user profile page site aware. WL-1289
 2018-02-13 19:03:34 +05:00
Simon Chen
4459be9d1d Merge pull request #17338 from edx/sstudent/EDUCATOR-2189 
progress indicators on courseware ribbon
 2018-02-12 16:37:09 -05:00
Tomasz Gargas
605f080b9a Simplify the content enrollment tab in the CCX Dashboard. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:47:49 +01:00
Tomasz Gargas
841ddacc37 Make missing parts of Enrollment tab in CCX dashboard translatable. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:46:55 +01:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Stu Young
3290bce993 Merge pull request #17458 from edx/testeng/bokchoy_auto_cache_update_cbd6c289f75ad4249dbb15dcb53b859045df7ef9 
Bokchoy db cache update
 2018-02-12 15:32:52 -05:00
Sanford Student
8956739a34 Add the visual indicator to the sequence horizontal nav bar to mark verticals completed 
EDUCATOR-2189
 2018-02-12 15:26:40 -05:00
edx-cache-uploader-bot
41926a99e0 Updating migrations 2018-02-12 14:24:58 -05:00
Brian Mesick
b72eb8c31b Merge pull request #17434 from edx/bmedx/splash_to_pypi 
Use new PyPI package for django-splash
 2018-02-12 14:12:59 -05:00
Michael LoTurco
a97372fbdb Merge pull request #17423 from edx/MLoTurco/learner-3919 
Add EntitlementSupportDetailModel
 2018-02-12 12:52:47 -05:00
Michael LoTurco
82f4ce4252 Add CourseEntitlementSupportDetail model and related admin model 
Learner-3919
 2018-02-12 11:43:44 -05:00
Diana Huang
5cca46d161 Merge pull request #17442 from edx/diana/fix-ordering 
Use the same ordering for LA dashboard as progress page.
 2018-02-12 11:24:30 -05:00
bmedx
5c4bfdc341 Use new PyPI package for django-splash 2018-02-12 11:17:41 -05:00
Farhanah Sheets
8bc2657542 Merge pull request #17433 from edx/fsheets/chrome-iframe-update 
Update iframe allowances for chrome v64
 2018-02-12 10:34:27 -05:00
Diana Huang
eab84c9a0f Use the same ordering for LA dashboard as progress page. 2018-02-12 10:18:07 -05:00
Farhanah Sheets
e73b95f1c8 Update lti iframe in platform & xblock github version 2018-02-12 09:36:06 -05:00
Jeremy Bowman
a600ef4c25 Merge pull request #17444 from edx/jmbowman/PLAT-1948 
PLAT-1948 Update the cached lettuce test databases
 2018-02-12 08:25:37 -05:00
adeel khan
a8202c75be Merge pull request #17452 from edx/adeel/fix_xss_failing_test 
Fix xss-linter.py failing test.
 2018-02-12 14:05:25 +01:00
Adeel Khan
961bdce5fa Fix xss-linter.py failing test. 2018-02-12 17:05:02 +05:00
Tasawer Nawaz
ee2c983bf5 Merge pull request #17439 from edx/tasawer/learner-3342/fix-for-if-goal-key-is-none 
update CourseGoalViewSet to return status=400 if no goal key is provided
 2018-02-12 16:31:56 +05:00
Tasawer Nawaz
898db2e376 update CourseGoalViewSet to return status=400 if no goal key is provided LEARNER-3342 2018-02-12 15:07:32 +05:00
Ibrahim Ahmed
9bbeabaddb Merge pull request #17440 from edx/ibrahimahmed443/WL-1438-programs-page-typo 
fix typo in program marketing page
 2018-02-12 14:48:25 +05:00
Ibrahim
046871e072 fix typo in program marketing page 2018-02-12 12:39:09 +05:00
John Eskew
fb5ca89f4b Merge pull request #17445 from edx/jeskew/bump_edx_proctoring_version 
Move to PyPI install of edx-proctoring.
 2018-02-09 19:07:24 -05:00
Tyler Hallada
f99fb4f506 Merge pull request #17443 from edx/thallada/comment-bad-index 
Temporarily comment bad index in ensure_indexes
 2018-02-09 18:01:33 -05:00
Jeremy Bowman
b15882e277 PLAT-1948 Update the cached lettuce test databases 2018-02-09 16:07:35 -05:00
John Eskew
4e3e62b6d9 Move to PyPI install of edx-proctoring. 2018-02-09 15:59:55 -05:00
Tyler Hallada
523d479ce0 Temporarily comment bad index in ensure_indexes 2018-02-09 15:44:28 -05:00
Stu Young
350111b329 Merge pull request #17441 from edx/testeng/bokchoy_auto_cache_update_42faf22499804dcf29fc66e7c75fb7226d3ccf45 
Bokchoy db cache update
 2018-02-09 15:41:55 -05:00
Michael Youngstrom
6d67e83641 Merge pull request #17252 from edx/zoldak/TE-2396 
Shard the quality tasks on jenkins TE-2396
 2018-02-09 15:41:44 -05:00
Ned Batchelder
2be70b5d57 Merge pull request #17366 from mitodl/pdpinch/complex-calc 
Update functions in calc.py to work in complex plane
 2018-02-09 15:17:12 -05:00
Jesse Zoldak
31eeb16081 Shard the quality tasks on jenkins 2018-02-09 14:58:52 -05:00
edx-cache-uploader-bot
691e35f673 Updating migrations 2018-02-09 12:26:21 -05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions 
handle exceptions and create the necessary html in optimizely
 2018-02-09 08:59:40 -05:00
Muhammad Ammar
3fd91f3592 Merge pull request #17430 from edx/ammar/update-edxval 
update edxval to 0.1.10
 2018-02-09 18:27:58 +05:00
Ahsan Ul Haq
a42c1f6904 Merge pull request #17428 from edx/ahsan/LEARNER-4117-update-eligible-for-cert 
Making honor code not eligible for Certificate
 2018-02-09 15:13:05 +05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate 
LEARNER-4117
 2018-02-09 13:53:50 +05:00
Brian Mesick
b005276f68 Merge pull request #17435 from edx/bmedx/bump_chem_version 
Update chem version to force new nltk requirement to be picked up
 2018-02-08 17:08:22 -05:00
bmedx
c8aca84619 Update chem version to force new nltk requirement to be picked up 2018-02-08 17:02:31 -05:00
Ned Batchelder
60a4e6d864 Merge pull request #17339 from caesar2164/make-studio-sock-links-themable 
Define Studio sock links in separate themable file
 2018-02-08 15:20:22 -05:00
Feanil Patel
200dd4d86c Merge pull request #17432 from edx/feanil/update_paver 
Stop using our fork of paver and use PyPI
 2018-02-08 13:00:07 -05:00
Matthew Piatetsky
618146e415 addressing comments 2018-02-08 11:29:56 -05:00
Feanil Patel
1248d7b058 Stop using our fork of paver and use PyPI 
The problem we were having with paver 1.2.4 has been fixed and so we can go back to using the mainline paver now.
 2018-02-08 10:47:11 -05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
muhammad-ammar
13f85b9e7c update edxval to 0.1.10 2018-02-08 18:51:17 +05:00
Attiya Ishaque
3ee811d6e1 Merge pull request #17382 from edx/ai/EDUCATOR-2224-discussion-post 
EDUCATOR-2224 Discussion Topic with no posts have message.
 2018-02-08 15:56:57 +05:00
attiyaishaque
9704146e40 EDUCATOR-2224 Discussion Topic with no posts have message. 2018-02-08 14:47:04 +05:00