Commits · eda5f45dafed5663a4d3e3866c0a9dfb804994e5 · edx / edx-platform · GitLab

07 Apr, 2017 4 commits
- Merge pull request #14842 from edx/sstudent/rescore_fix · eda5f45d
```
for TNL-6825, fix rescore logic
```
  sanfordstudent committed Apr 07, 2017
  eda5f45d Browse Files
- for TNL-6825, fix rescore logic · 0f53585a
  Sanford Student committed Apr 07, 2017
  
  0f53585a Browse Files
- Merge pull request #14817 from edx/zub/ENT-277-enterprise-version-bump-to-31.2 · 6431d0f6
```
bump enterprise version from 0.30.0 to 0.32.0
```
  Zubair Afzal committed Apr 07, 2017
  6431d0f6 Browse Files
- bump enterprise version from 0.30.0 to 0.31.2 · fd58f95c
```
ENT-277
```
  zubair-arbi committed Apr 07, 2017
  fd58f95c Browse Files
06 Apr, 2017 11 commits
- Merge pull request #14773 from edx/ECOM-7388 · 2e20c28f
```
ECOM-7388 Program details page redesign
```
  Matthew Piatetsky committed Apr 06, 2017
  2e20c28f Browse Files
- Program Progress page redesign · 18ac075a
```
ECOM-7388
```
  Matthew Piatetsky committed Apr 06, 2017
  18ac075a Browse Files
- Updated Docker devstack settings to support an external marketing site · eaed23d5
```
These changes help simplify integrating with edx.org's separate marketing site.

ECOM-6627
```
  Clinton Blackburn committed Apr 06, 2017
  eaed23d5 Browse Files
- Merge pull request #14800 from edx/jlajoie/TNL-6739 · fac7e288
```
TNL-6739: Adds in masquerading as enrollment track user
```
  Jeff LaJoie committed Apr 06, 2017
  fac7e288 Browse Files
- Merge pull request #14829 from edx/andya/page-query-tests · ae1903fe
```
Add query count tests for old and new course pages
```
  Andy Armstrong committed Apr 06, 2017
  ae1903fe Browse Files
- Merge pull request #14648 from edx/iivic/fix-get-xblock-settings · 871c9310
```
Fix get xblock settings
```
  Jeremy Bowman committed Apr 06, 2017
  871c9310 Browse Files
- Merge pull request #14832 from edx/sstudent/update_dnd_2_0_18 · 792db759
```
upgrade dnd
```
  sanfordstudent committed Apr 06, 2017
  792db759 Browse Files
- Merge pull request #14819 from edx/ai/TNL-6284-blank-subcategories · b3793f43
```
TNL-6284 Empty subcategory will not render in inline discussion modules.
```
  Attiya Ishaque committed Apr 06, 2017
  b3793f43 Browse Files
- TNL-6739: adds in masquerading as enrollment track user · 413bce3d
  Jeff LaJoie committed Apr 06, 2017
  
  413bce3d Browse Files
- TNL-6284 Empty subcategory will not render in inline discussion modules. · a7550912
  attiyaishaque committed Apr 06, 2017
  
  a7550912 Browse Files
- Add query count tests for old and new course pages · e7a4ed74
  Andy Armstrong committed Apr 05, 2017
  
  e7a4ed74 Browse Files
05 Apr, 2017 11 commits
- Collect data needed for program progress sidebar · f00059f2
```
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
```
  Renzo Lucioni committed Apr 05, 2017
  f00059f2 Browse Files
- Merge pull request #14827 from edx/robrap/LEARNER-418 · d0fe7f84
```
Refactor more tests to use course home page.
```
  Robert Raposa committed Apr 05, 2017
  d0fe7f84 Browse Files
- Updated program filter for learner dashboard · bc45f82f
```
Learners will now see both active and retired programs on their
dashboards.

ECOM-7625
```
  Clinton Blackburn committed Apr 05, 2017
  bc45f82f Browse Files
- upgrade dnd · 3e4163aa
  Sanford Student committed Apr 05, 2017
  
  3e4163aa Browse Files
- Add bulk operations around CourseTabView rendering · aa378198
  Andy Armstrong committed Apr 05, 2017
  
  aa378198 Browse Files
- Merge pull request #14798 from edx/christina/tnl-6744 · 15ab2b6b
```
Add Enrollment tracks to component visibility dialog
```
  Christina Roberts committed Apr 05, 2017
  15ab2b6b Browse Files
- Add ability to set visibility by enrollment track. · dbae1e39
```
TNL-6744
```
  cahrens committed Apr 05, 2017
  dbae1e39 Browse Files
- Fix getting xblock settings in studio edit modal · 49c3f20a
  iivic committed Apr 05, 2017
  
  49c3f20a Browse Files
- Refactor more tests to use course home page. · ad84b8d4
  Robert Raposa committed Apr 05, 2017
  
  ad84b8d4 Browse Files
- Merge pull request #14825 from edx/release-mergeback-to-master · e2c81835
```
Merge release back to master
```
  Fred Smith committed Apr 05, 2017
  e2c81835 Browse Files
- Merge pull request #14676 from edx/mushtaq/fix-discard-multiple-components · 447c5c23
```
Fix multiple copies of components on discard changing a move operation.
```
  Muzaffar yousaf committed Apr 05, 2017
  447c5c23 Browse Files
04 Apr, 2017 13 commits
- Fix broken LMS Help Links · f94a726c
  Carol Tong committed Apr 04, 2017
  
  f94a726c Browse Files
- fix issue where orphaned openassessment blocks cause 500 errors on the… · 12e52262
```
fix issue where orphaned openassessment blocks cause 500 errors on the instructor dashboard (TNL-6797)
```
  Adam Palay committed Apr 04, 2017
  12e52262 Browse Files
- Merge pull request #14821 from edx/jeskew/update_django_1_8 · a45e5cd6
```
Upgrade Django from 1.8.17 to 1.8.18
```
  John Eskew committed Apr 04, 2017
  a45e5cd6 Browse Files
- Merge pull request #14812 from edx/carol/HelpLinkFixes · b7c45070
```
Fix broken LMS Help Links
```
  Carol Tong committed Apr 04, 2017
  b7c45070 Browse Files
- Merge pull request #14809 from edx/sstudent/TNL-6696 · aa31af77
```
use current()
```
  sanfordstudent committed Apr 04, 2017
  aa31af77 Browse Files
- Merge pull request #14797 from edx/afzaledx/WL-1016 · a7ba52d8
```
WL-1016 | Added org argument for bulk_change_enrollment management command.
```
  Afzal Wali Naushahi committed Apr 04, 2017
  a7ba52d8 Browse Files
- Upgrade Django from 1.8.17 to 1.8.18 · 410133d8
  John Eskew committed Apr 04, 2017
  
  410133d8 Browse Files
- Fix broken LMS Help Links · 8ee34ab3
  Carol Tong committed Apr 04, 2017
  
  8ee34ab3 Browse Files
- Fix multiple copies of components on discard changing a move operation - TNL-6670 · 0bede128
  Mushtaq Ali committed Apr 04, 2017
  
  0bede128 Browse Files
- WL-1016 | Added org argument for bulk_change_enrollment management command. · 0c3e6b6e
  Afzal Wali committed Apr 04, 2017
  
  0c3e6b6e Browse Files
- Merge pull request #14801 from edx/asadazam/tnl-6637-updated-log · f32e7988
```
Asadazam/tnl 6637 updated log
```
  AsadAzam committed Apr 04, 2017
  f32e7988 Browse Files
- updated eligible_for_certificate log · a4e50f1a
  Asad Azam committed Apr 04, 2017
  
  a4e50f1a Browse Files
- Modify program progress meter for use on detail pages · 72dd85ce
```
The meter now supports use with a single program, and can return serialized courses instead of counts when measuring progress.

ECOM-6602
```
  Renzo Lucioni committed Apr 03, 2017
  72dd85ce Browse Files
03 Apr, 2017 1 commit
- use current() · e94513d0
  Sanford Student committed Apr 03, 2017
  
  e94513d0 Browse Files