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

40719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
eaed23d55c Updated Docker devstack settings to support an external marketing site 
These changes help simplify integrating with edx.org's separate marketing site.

ECOM-6627
 2017-04-06 16:10:44 -04:00
Jeff LaJoie
fac7e288c8 Merge pull request #14800 from edx/jlajoie/TNL-6739 
TNL-6739: Adds in masquerading as enrollment track user
 2017-04-06 10:29:02 -04:00
Andy Armstrong
ae1903fe8c Merge pull request #14829 from edx/andya/page-query-tests 
Add query count tests for old and new course pages
 2017-04-06 10:23:43 -04:00
Jeremy Bowman
871c931065 Merge pull request #14648 from edx/iivic/fix-get-xblock-settings 
Fix get xblock settings
 2017-04-06 10:17:58 -04:00
sanfordstudent
792db7594f Merge pull request #14832 from edx/sstudent/update_dnd_2_0_18 
upgrade dnd
 2017-04-06 10:13:33 -04:00
Attiya Ishaque
b3793f43aa Merge pull request #14819 from edx/ai/TNL-6284-blank-subcategories 
TNL-6284 Empty subcategory will not render in inline discussion modules.
 2017-04-06 18:37:40 +05:00
Jeff LaJoie
413bce3d72 TNL-6739: adds in masquerading as enrollment track user 2017-04-06 09:35:08 -04:00
attiyaishaque
a7550912f8 TNL-6284 Empty subcategory will not render in inline discussion modules. 2017-04-06 12:00:53 +05:00
Andy Armstrong
e7a4ed742a Add query count tests for old and new course pages 2017-04-05 21:35:34 -04:00
Renzo Lucioni
f00059f28c Collect data needed for program progress sidebar 
This includes a representation of the user's progress towards completing each course in the program and a list of any relevant course and/or program certificates the user has earned.

ECOM-7386
 2017-04-05 19:06:28 -04:00
Robert Raposa
d0fe7f8422 Merge pull request #14827 from edx/robrap/LEARNER-418 
Refactor more tests to use course home page.
 2017-04-05 17:29:30 -04:00
Clinton Blackburn
bc45f82f5c Updated program filter for learner dashboard 
Learners will now see both active and retired programs on their
dashboards.

ECOM-7625
 2017-04-05 16:18:51 -04:00
Sanford Student
3e4163aa6d upgrade dnd 2017-04-05 15:37:24 -04:00
Andy Armstrong
aa3781988e Add bulk operations around CourseTabView rendering 2017-04-05 14:23:19 -04:00
Christina Roberts
15ab2b6be7 Merge pull request #14798 from edx/christina/tnl-6744 
Add Enrollment tracks to component visibility dialog
 2017-04-05 12:10:56 -04:00
cahrens
dbae1e397d Add ability to set visibility by enrollment track. 
TNL-6744
 2017-04-05 11:05:31 -04:00
iivic
49c3f20a15 Fix getting xblock settings in studio edit modal 2017-04-05 14:44:41 +00:00
Robert Raposa
ad84b8d46e Refactor more tests to use course home page. 2017-04-05 10:28:26 -04:00
Fred Smith
e2c81835c5 Merge pull request #14825 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-05 08:52:22 -04:00
Muzaffar yousaf
447c5c2310 Merge pull request #14676 from edx/mushtaq/fix-discard-multiple-components 
Fix multiple copies of components on discard changing a move operation.
 2017-04-05 12:21:49 +05:00
Carol Tong
f94a726ce9 Fix broken LMS Help Links 2017-04-04 12:59:31 -04:00
Adam Palay
12e5226286 fix issue where orphaned openassessment blocks cause 500 errors on the instructor dashboard (TNL-6797) 2017-04-04 12:59:12 -04:00
John Eskew
a45e5cd679 Merge pull request #14821 from edx/jeskew/update_django_1_8 
Upgrade Django from 1.8.17 to 1.8.18
 2017-04-04 11:43:23 -04:00
Carol Tong
b7c4507055 Merge pull request #14812 from edx/carol/HelpLinkFixes 
Fix broken LMS Help Links
 2017-04-04 11:30:55 -04:00
sanfordstudent
aa31af778b Merge pull request #14809 from edx/sstudent/TNL-6696 
use current()
 2017-04-04 10:56:50 -04:00
Afzal Wali Naushahi
a7ba52d88f Merge pull request #14797 from edx/afzaledx/WL-1016 
WL-1016 | Added org argument for bulk_change_enrollment management command.
 2017-04-04 19:03:03 +05:00
John Eskew
410133d8e8 Upgrade Django from 1.8.17 to 1.8.18 2017-04-04 09:58:15 -04:00
Carol Tong
8ee34ab3ba Fix broken LMS Help Links 2017-04-04 09:22:03 -04:00
Mushtaq Ali
0bede12821 Fix multiple copies of components on discard changing a move operation - TNL-6670 2017-04-04 16:53:35 +05:00
Afzal Wali
0c3e6b6e5e WL-1016 | Added org argument for bulk_change_enrollment management command. 2017-04-04 16:25:07 +05:00
AsadAzam
f32e7988e2 Merge pull request #14801 from edx/asadazam/tnl-6637-updated-log 
Asadazam/tnl 6637 updated log
 2017-04-04 14:29:38 +05:00
Asad Azam
a4e50f1add updated eligible_for_certificate log 2017-04-04 12:54:32 +05:00
Renzo Lucioni
72dd85cebf Modify program progress meter for use on detail pages 
The meter now supports use with a single program, and can return serialized courses instead of counts when measuring progress.

ECOM-6602
 2017-04-03 22:19:04 -04:00
Sanford Student
e94513d079 use current() 2017-04-03 11:22:26 -04:00
Matt Drayer
4baf18fe04 Merge pull request #14783 from edx/mattdrayer/ENT-293 
ENT-293: Add SAML metadata refresh control flag
 2017-04-03 10:32:48 -04:00
Muhammad Ammar
073826cac7 Merge pull request #14738 from edx/ammar/fix-flaky-video-js-test 
fix flaky video js test
 2017-04-03 11:33:10 +05:00
Matt Drayer
b64503848c Add SAML metadata refresh control flag 
mattdrayer: Change model fieldname, revise code, fix bad tests.
 2017-04-02 16:47:20 -04:00
Andy Armstrong
4ef009cf4f Merge pull request #14805 from edx/andya/fix-help-link-tests 
Update doc URLs for online help Bok Choy tests
 2017-04-01 22:24:43 -04:00
Andy Armstrong
ebe2ca2ce9 Update URL for Studio getting started guide 2017-04-01 18:48:20 -04:00
Andy Armstrong
adb17172dc Update doc URLs for online help link tests 2017-04-01 18:48:19 -04:00
Andy Armstrong
3be8f92bdf Merge pull request #14790 from edx/andya/course-redirects 
Add data sharing consent redirect for more course tabs
 2017-04-01 08:34:11 -04:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs 
LEARNER-394
 2017-03-31 19:12:13 -04:00
Robert Raposa
c6f2db3573 Merge pull request #14774 from edx/rraposa/LEARNER-36 
LEARNER-36: Add new relic custom metrics to course home.
 2017-03-31 16:53:49 -04:00
Robert Raposa
ffe64add55 Add new relic custom metrics to course home. 
- Add new utilities to monitoring_utils djangoapp.
- Use new utilities for all new course tabs.
 2017-03-31 15:19:53 -04:00
Robert Raposa
77f111b2b1 Moves and rename common/djangoapps/newrelic_custom_metrics. 2017-03-31 15:19:53 -04:00
Robert Raposa
d95620775b Merge pull request #14792 from edx/robrap/LEARNER-346 
LEARNER-346: Refactor tests for new course outline.
 2017-03-31 12:50:56 -04:00
Christina Roberts
d445c2355f Merge pull request #14802 from edx/christina/mockpartitionscheme 
Remove dependency on test_partitions.
 2017-03-31 11:36:55 -04:00
Ari Rizzitano
8249f33c92 Merge pull request #14744 from edx/ari/video-transcript-focus 
video a11y improvements (TNL-6361, AC-587)
 2017-03-31 11:22:11 -04:00
Robert Raposa
6362d2259c Refactor tests for new course outline. 2017-03-31 10:47:35 -04:00
cahrens
ec5194365a Remove dependency on test_partitions. 2017-03-31 10:40:51 -04:00