Commits · f7ef9eb511e43a59129472a36e20ac95298b8aa4 · edx / edx-platform

16 Oct, 2014 12 commits
- Merge pull request #5510 from edx/christina/bug-tnl-543 · f7ef9eb5
```
Pass group_id when getting user thread and comment counts.
```
  Christina Roberts committed Oct 16, 2014
  f7ef9eb5 Browse Files
- Merge pull request #5604 from edx/carol/docs/noteformatfix · c7204c61
```
Fixed note formatting
```
  Carol Tong committed Oct 16, 2014
  c7204c61 Browse Files
- Fixed note formatting · f0eedffd
  Carol Tong committed Oct 16, 2014
  
  f0eedffd Browse Files
- Merge pull request #5561 from edx/bugfix/ichuang/fix-invalid-key-name-child-id · 3604dfce
```
fix tracking log entry key child-id -> child_id
```
  brianhw committed Oct 16, 2014
  3604dfce Browse Files
- Pass group_id when getting user thread and comment counts. · 7133cfc1
```
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
```
  cahrens committed Oct 16, 2014
  7133cfc1 Browse Files
- Merge pull request #5590 from cpennington/xblocks-with-children · e00b666d
```
Enable pure XBlocks to use children in edx-platform
```
  Calen Pennington committed Oct 16, 2014
  e00b666d Browse Files
- Merge pull request #5594 from edx/diana/open-id-bug · 011b4dc1
```
Handle OpenID errors for POST requests.
```
  Diana Huang committed Oct 16, 2014
  011b4dc1 Browse Files
- Escape xblock wrapper data attributes and css classes for safe html · fee681be
  Calen Pennington committed Oct 16, 2014
  
  fee681be Browse Files
- Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) · 4d653d53
```
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
```
  Calen Pennington committed Oct 16, 2014
  4d653d53 Browse Files
- Add block type to the available attributes in the xblock javascript frontend · 41f3c040
  Calen Pennington committed Oct 16, 2014
  
  41f3c040 Browse Files
- Add block.name to xblock javascript frontend · 4a43427c
  Calen Pennington committed Oct 16, 2014
  
  4a43427c Browse Files
- Enable parent/child tests using the acid XBlock. · 47a3172b
```
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
```
  Calen Pennington committed Oct 16, 2014
  47a3172b Browse Files
15 Oct, 2014 16 commits
- Merge pull request #5552 from edx/benp/diff-cover-threshold2 · c8ddc84d
```
Benp/diff cover threshold2
```
  Ben Patterson committed Oct 15, 2014
  c8ddc84d Browse Files
- Merge pull request #5528 from edx/dan-f/data-download-tech-debt · 64d2514f
```
Student profile CSV background task tech debt
```
  Daniel Friedman committed Oct 15, 2014
  64d2514f Browse Files
- Handle OpenID errors for POST requests. · 0c6cba73
```
ECOM-441
```
  Diana Huang committed Oct 15, 2014
  0c6cba73 Browse Files
- Merge pull request #5582 from edx/dan-f/cohorts-internationalization · 33cfb9c7
```
Ensure all user-facing cohort-related strings are internationalized
```
  Daniel Friedman committed Oct 15, 2014
  33cfb9c7 Browse Files
- Bump the report downloads poll interval to 20 seconds · 62c46c80
```
TNL-565
```
  Daniel Friedman committed Oct 15, 2014
  62c46c80 Browse Files
- Create standard way of updating a task's progress · 37158bab
```
TNL-566
```
  Daniel Friedman committed Oct 15, 2014
  37158bab Browse Files
- Verify cohort strings are scraped for translation · a9fc3b03
  Daniel Friedman committed Oct 15, 2014
  
  a9fc3b03 Browse Files
- Merge pull request #5534 from edx/i18n-cms-index · a3ac57bb
```
Some strings were missing i18n calls
```
  David Baumgold committed Oct 15, 2014
  a3ac57bb Browse Files
- Introduce new switch for paver run_quality command. · 6bcaf61b
```
When using -p, the underlying diff-quality command will pass that
number as a value for --fail-under.

For example,
  paver run_quality -p 75

Will pass 75 into the --fail-under switch on diff-quality.

Also upgrades diff-cover in order to take advantage of this funcitonality.
```
  Ben Patterson committed Oct 15, 2014
  6bcaf61b Browse Files
- Replace course status message · eba03512
  David Baumgold committed Oct 15, 2014
  
  eba03512 Browse Files
- Some strings were missing i18n calls · 0f07bad3
  David Baumgold committed Oct 15, 2014
  
  0f07bad3 Browse Files
- Merge pull request #5376 from edx/sarina/new-contributor-docs · 11fb9364
```
Update Contributing documentation with new PR process. OPEN-111
```
  Sarina Canelake committed Oct 15, 2014
  11fb9364 Browse Files
- Update Contributing documentation with new PR process. OPEN-111 · 8f9f4ba5
  Sarina Canelake committed Oct 15, 2014
  
  8f9f4ba5 Browse Files
- Merge pull request #5584 from edx/nimisha/val/MA-81 · e0f9def0
```
MA-81 Honor video download setting with VAL-enabled videos.
```
  Nimisha Asthagiri committed Oct 15, 2014
  e0f9def0 Browse Files
- Merge pull request #5555 from edx/talbs/fix-studio-rerun-notification · 1171d0ec
```
Studio: FIX - Course Rerun Outline Notification Icon Display
```
  Brian Talbot committed Oct 15, 2014
  1171d0ec Browse Files
- MA-81 Honor video download setting with VAL-enabled videos. · 5355b4b9
  Nimisha Asthagiri committed Oct 14, 2014
  
  5355b4b9 Browse Files
14 Oct, 2014 12 commits
- Merge pull request #5573 from edx/will/django-countries-fix · 26a94afb
```
Update django-countries to 2.1.2, override country name for Taiwan
```
  Will Daly committed Oct 14, 2014
  26a94afb Browse Files
- Merge pull request #5536 from edx/sanchez/remove-new-header-footer-flags · 7df00578
```
Removing the feature flags for new header and footer.
```
  Stephen Sanchez committed Oct 14, 2014
  7df00578 Browse Files
- Merge pull request #5551 from edx/renzo/track-selection-test-cleanup · 257e8cf8
```
Clean up after track selection experiment
```
  Renzo Lucioni committed Oct 14, 2014
  257e8cf8 Browse Files
- Add coverage for cohort view's `showSection` link · e9292fb5
```
TNL-550
```
  Daniel Friedman committed Oct 14, 2014
  e9292fb5 Browse Files
- Rename `upload_*_to_s3` to no longer reference s3 · 1b03534b
```
TNL-534
```
  Daniel Friedman committed Oct 14, 2014
  1b03534b Browse Files
- Studio: resolving post-course rerun outline UI alert icon display issue · 0a633eaf
```
UX-1054
```
  Brian Talbot committed Oct 14, 2014
  0a633eaf Browse Files
- Clean up after track selection experiment · bd7715a3
  Renzo Lucioni committed Oct 14, 2014
  
  bd7715a3 Browse Files
- Removing the feature flags for new header and footer. · c15d97ea
```
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
```
  stephensanchez committed Oct 14, 2014
  c15d97ea Browse Files
- Merge pull request #5572 from edx/markhoeber-doc-928 · f1c81d42
```
Removed Vitalsource e-reader information
```
  Mark Hoeber committed Oct 14, 2014
  f1c81d42 Browse Files
- Removed Vitalsource e-reader information · b840d723
  Mark Hoeber committed Oct 14, 2014
  
  b840d723 Browse Files
- Update django-countries to 2.1.2, override country name for Taiwan · ad11c1b6
  Will Daly committed Oct 14, 2014
  
  ad11c1b6 Browse Files
- Merge pull request #5541 from edx/will/dashboard-js-shame · 5d77fab2
```
Dashboard template cleanup
```
  Will Daly committed Oct 14, 2014
  5d77fab2 Browse Files