Commits · d881067f8446a9c166eac2726c8d321f96031b0f · edx / edx-platform · GitLab

27 Aug, 2015 16 commits
- Merge pull request #8835 from edx/utkjad/injecting_callstackmanager · d881067f
```
[PLAT -758] Making Call Stack Manager work in StudentModule and StudentModuleHistory, add @trackit, @wrapt dependency, and refine conditions
```
  Utkarsh committed Aug 27, 2015
  d881067f Browse Files
- Merge pull request #9415 from edx/christina/insensitive-check · df76994e
```
Do a case insensitive check for conflicts to improve performance.
```
  Christina Roberts committed Aug 27, 2015
  df76994e Browse Files
- Use team name prefix and UUID for team_id. · 41ac90fa
```
TNL-3107
```
  cahrens committed Aug 27, 2015
  41ac90fa Browse Files
- Merge pull request #9467 from edx/will/upgrade-django-mptt · 3c400783
```
Upgrade django-mptt to 0.7.4
```
  Will Daly committed Aug 27, 2015
  3c400783 Browse Files
- Merge pull request #9477 from edx/ned/clarify-advanced-component-types · b6626620
```
Add a comment explaining what ADVANCED_COMPONENT_TYPES should be.
```
  Ned Batchelder committed Aug 27, 2015
  b6626620 Browse Files
- Merge pull request #9484 from edx/zoldak/coverage-371 · 15ce2e10
```
Updated coverage to 3.7.1
```
  Jesse Zoldak committed Aug 27, 2015
  15ce2e10 Browse Files
- Merge pull request #9462 from edx/waheed/plat808-added-course-id-in-exception · 6b81f72d
```
Added course in exception message for InvalidTabsException.
```
  Waheed Ahmed committed Aug 27, 2015
  6b81f72d Browse Files
- Merge pull request #9417 from edx/raees-chrome-bok-choy-tests · 03520e66
```
Fixed test_new_textbook_uplaod test that was failing on Chrome
```
  raeeschachar committed Aug 27, 2015
  03520e66 Browse Files
- Merge pull request #9444 from edx/raees-chrome-bok-choy-test-cohort-enable-disable · 646bd939
```
Fixed Chrome test cohort enabled disabled in Cohort Configuration Test
```
  raeeschachar committed Aug 27, 2015
  646bd939 Browse Files
- Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms · d38da773
```
Confirm when leaving team
```
  Muhammad Ammar committed Aug 27, 2015
  d38da773 Browse Files
- Add a comment explaining what ADVANCED_COMPONENT_TYPES should be. · 65a31795
```
While I'm in there, also fix the comment for ADVANCED_PROBLEM_TYPES.
```
  Ned Batchelder committed Aug 27, 2015
  65a31795 Browse Files
- Added course in exception message for InvalidTabsException. · 76464339
  Waheed Ahmed committed Aug 27, 2015
  
  76464339 Browse Files
- Merge pull request #9459 from… · d8f484ac
```
Merge pull request #9459 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints

Remove experimental logistration endpoints
```
  tasawernawaz committed Aug 27, 2015
  d8f484ac Browse Files
- Fixed Chrome test cohort enabled disabled in Cohort Configuration Test · 7cf3895c
  raeeschachar committed Aug 27, 2015
  
  7cf3895c Browse Files
- Removing experimental logistration endpoints · 07148c63
```
ECOM-1017
```
  Tasawer committed Aug 27, 2015
  07148c63 Browse Files
- Merge pull request #9474 from edx/asadiqbal08/SOL-1128 · 40b5663b
```
asadiqbal08/SOL-1128-Certificates: Studio Setup Copy and UI changes
```
  Matt Drayer committed Aug 27, 2015
  40b5663b Browse Files
26 Aug, 2015 21 commits
- Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and… · 387303d3
```
Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and refining implementation[PLAT-758]
```
  utkjad committed Aug 26, 2015
  387303d3 Browse Files
- Merge pull request #9487 from edx/release-2015-08-26-conflict · a3599425
```
Merging 2015-08-26 release conflict branch to master
```
  David Ormsbee committed Aug 26, 2015
  a3599425 Browse Files
- PEP8 fix. · 7543e05b
  David Ormsbee committed Aug 26, 2015
  
  7543e05b Browse Files
- Merge branch 'release' into release-2015-08-26-conflict · ff62a8ea
  David Ormsbee committed Aug 26, 2015
  
  ff62a8ea Browse Files
- Merge pull request #9461 from edx/awais786/XCOM-538-otto-admin-restrict-nonexisting-course · 830a695f
```
adding validator to make sure course exists in db before creating in …
```
  Awais Qureshi committed Aug 26, 2015
  830a695f Browse Files
- Merge pull request #9436 from edx/rc/2015-08-25 · 02cc9ca8
```
2015-08-25 Release
```
  David Ormsbee committed Aug 26, 2015
  02cc9ca8 Browse Files
- Merge pull request #9463 from edx/efischer/js-flakes · 94e11e1e
```
Revert "Fix for flaky TeamDiscussionView js tests"
```
  Eric Fischer committed Aug 26, 2015
  94e11e1e Browse Files
- Updated coverage to 3.7.1 · 1340ec8c
  Jesse Zoldak committed Aug 26, 2015
  
  1340ec8c Browse Files
- Removing extraneous render from team_discussion.js · 4d974730
```
On the advice of https://github.com/edx/edx-platform/pull/9470,
the render call here is not needed and should be removed in order
to allow the view's owner to determine when it needs to be rendered.

This will hopefully also fix the flaky tests we've been seeing,
we'll need to continue to monitor the builds to be sure.
```
  Eric Fischer committed Aug 26, 2015
  4d974730 Browse Files
- Revert "Fix for flaky TeamDiscussionView js tests" · 3e407b9d
```
This reverts commit d64c2b29.
```
  Eric Fischer committed Aug 26, 2015
  3e407b9d Browse Files
- Merge pull request #9481 from edx/revert-9456-derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS · 4bc62274
```
Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYT…
```
  Fred Smith committed Aug 26, 2015
  4bc62274 Browse Files
- adding validator to make sure course exists in db before creating in otto. · cdfc9da4
  Awais committed Aug 26, 2015
  
  cdfc9da4 Browse Files
- Merge pull request #9480 from edx/ormsbee/pull_from_last_weeks_hotix · 74394bfe
```
Fixes modal color
```
  David Ormsbee committed Aug 26, 2015
  74394bfe Browse Files
- Review changes · d8b419c6
  muhammad-ammar committed Aug 26, 2015
  
  d8b419c6 Browse Files
- Move studio dialog code into common · 6134e8b5
  muhammad-ammar committed Aug 26, 2015
  
  6134e8b5 Browse Files
- Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…" · 16ac5801
  Fred Smith committed Aug 26, 2015
  
  16ac5801 Browse Files
- Fixes modal color · 96fc3063
  Chris Rodriguez committed Aug 26, 2015
  
  96fc3063 Browse Files
- Merge pull request #9418 from edx/usman/tnl2883-video-tests · 6a1be48e
```
Fix video bumper tests.
```
  Usman Khalid committed Aug 26, 2015
  6a1be48e Browse Files
- SOL-1128 · 43316ea8
  asadiqbal committed Aug 26, 2015
  
  43316ea8 Browse Files
- Fixed video bumper tests. · 0dbb969b
```
TNL-2883
```
  Usman Khalid committed Aug 26, 2015
  0dbb969b Browse Files
- Merge pull request #9450 from edx/peter-fogg/sort-topic-page · 4aec2abf
```
Add sorting controls on topics page.
```
  Peter Fogg committed Aug 25, 2015
  4aec2abf Browse Files
25 Aug, 2015 3 commits
- Merge pull request #9471 from edx/jibsheet/third-party-auth-settings · 65377423
```
Allow configuring sensitive third_party_auth settings via lms.auth.json
```
  Kevin Falcone committed Aug 25, 2015
  65377423 Browse Files
- Add sorting controls on Teams topics page. · 382909b7
```
TNL-1936
```
  Peter Fogg committed Aug 25, 2015
  382909b7 Browse Files
- Allow configuring sensitive third_party_auth settings via lms.auth.json · 79a07532
  Braden MacDonald committed Aug 25, 2015
  
  79a07532 Browse Files