Commits · c09632ef69071cd06d2a085ec20ac9532206e7d9 · edx / edx-platform · GitLab

22 Oct, 2014 1 commit
- Tests for conditional content (split_test module). · c09632ef
```
TNL-39
```
  cahrens committed Oct 22, 2014
  c09632ef Browse Files
17 Oct, 2014 8 commits
- Merge pull request #5589 from edx/christina/tnl-399-remove-save · 2ae3fd0a
```
Do not save an xblock after rendering the Studio view.
```
  Christina Roberts committed Oct 17, 2014
  2ae3fd0a Browse Files
- Merge pull request #5566 from Kelketek/lazy_coursemode_translation · d1f256af
```
Lazy loading of CourseMode model's internationalization.
```
  Sarina Canelake committed Oct 17, 2014
  d1f256af Browse Files
- Do not save an xblock after rendering the Studio view. · d3012af7
```
TNL-399

Content and settings are no longer saved when Studio view is rendered.
```
  cahrens committed Oct 17, 2014
  d3012af7 Browse Files
- Merge pull request #5471 from edx/adam/thumbnail-extentions · 5511aba2
```
image files with different extensions should generate thumbnails with di...
```
  Adam committed Oct 17, 2014
  5511aba2 Browse Files
- Merge pull request #5599 from edx/adam/fix-matlab-invalid-char · 53c48024
```
gracefully fail when parsing xml with non-compatible string (TNL-347)
```
  Adam committed Oct 17, 2014
  53c48024 Browse Files
- Merge pull request #5587 from edx/waheed/tnl617-fix-cc-button-in-ie · 9d575990
```
Fixed CC button in internet explorer.
```
  Waheed Ahmed committed Oct 17, 2014
  9d575990 Browse Files
- Fixed CC button in internet explorer. · 16566684
```
TNL-617
```
  Waheed Ahmed committed Oct 17, 2014
  16566684 Browse Files
- Merge branch 'release' · 5703adb7
```
Includes rc/2014-10-14
```
  Ben Patterson committed Oct 16, 2014
  5703adb7 Browse Files
16 Oct, 2014 22 commits
- Merge pull request #5578 from edx/markhoeber-doc1083 · 208c6f1d
```
October 15, 2014 Release Notes
```
  Mark Hoeber committed Oct 16, 2014
  208c6f1d Browse Files
- Merge pull request #5507 from edx/markhoeber-UTC-change · e556bf82
```
Course times to use UTC
```
  Mark Hoeber committed Oct 16, 2014
  e556bf82 Browse Files
- Course times to use UTC · 2c5118ef
  Mark Hoeber committed Oct 16, 2014
  
  2c5118ef Browse Files
- Merge pull request #5236 from edx/pull-requests/review · 23877cfe
```
Common terminology for review comments
```
  Nimisha Asthagiri committed Oct 16, 2014
  23877cfe Browse Files
- Merge pull request #5529 from edx/ahodges/doc/DOC916mobile · 028d81fd
```
Updates to video events for mobile
```
  Alison Hodges committed Oct 16, 2014
  028d81fd Browse Files
- Updates to video events for mobile · 4c246000
  Alison Hodges committed Oct 16, 2014
  
  4c246000 Browse Files
- 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
- Replace tag/label with type, and an example. · ab5c7e58
  Nimisha Asthagiri committed Oct 16, 2014
  
  ab5c7e58 Browse Files
- Common terminology for review comments · 8693e78e
  Nimisha Asthagiri committed Oct 16, 2014
  
  8693e78e 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
- October 16, 2014 Release Notes · e403593c
  Mark Hoeber committed Oct 16, 2014
  
  e403593c Browse Files
- gracefully fail when parsing xml with non-compatible string (TNL-347) · e1def5c5
  Adam Palay committed Oct 16, 2014
  
  e1def5c5 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 9 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 #5554 from edx/jmclaus/fix-errors-discussion-xmodule · bb6cd7dc
```
Fixed errors in discussion XModule
```
  jmclaus committed Oct 15, 2014
  bb6cd7dc 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