Commits · ff2822cf48f280654438070546322af6853e43e3 · edx / edx-platform · GitLab

11 Jul, 2014 23 commits
- Fix cms tests · ff2822cf
  Sarina Canelake committed Jul 11, 2014
  
  ff2822cf Browse Files
- Update opaque-keys hash · ad7e0f94
  Diana Huang committed Jul 11, 2014
  
  ad7e0f94 Browse Files
- Fix test_import and unicode issues. · c2197732
```
Handle unicode in get_course_index
```
  Diana Huang committed Jul 11, 2014
  c2197732 Browse Files
- Fixed test that hardcoded url to deprecated format · 638a1aae
  Mat Peterson committed Jul 11, 2014
  
  638a1aae Browse Files
- Skip tests for location mapper · f82a950f
```
Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.
```
  Diana Huang committed Jul 11, 2014
  f82a950f Browse Files
- studio new style assumption corrections · 1b71ace4
  Mat Peterson committed Jul 11, 2014
  
  1b71ace4 Browse Files
- Switch offering to course and run · e39cc5df
  Mat Peterson committed Jul 11, 2014
  
  e39cc5df Browse Files
- Removed some definition_key references · 78a29595
  Mat Peterson committed Jul 11, 2014
  
  78a29595 Browse Files
- Fixed some isinstance errors with opaque-keys · 4f6088cb
  Mat Peterson committed Jul 11, 2014
  
  4f6088cb Browse Files
- Testing for bugs off master for opaque-keys deprecation · aee47b44
  Mat Peterson committed Jul 11, 2014
  
  aee47b44 Browse Files
- Merge pull request #4395 from edx/mvo/unittests_alone · 5f404ba2
```
Setting default system to be lms in unittests
```
  Minh-Tue Vo committed Jul 11, 2014
  5f404ba2 Browse Files
- Merge pull request #4390 from edx/benmcmorran/defensive-has-changes · 3d409cf3
```
Defensively checks that children exist in has_changes
```
  Ben McMorran committed Jul 11, 2014
  3d409cf3 Browse Files
- setting default system to be lms · be3c517f
  Minh Tue Vo committed Jul 11, 2014
  
  be3c517f Browse Files
- Merge pull request #4393 from edx/zoldak/disable-video-lang-test · 1999a726
```
Disable failing video language test
```
  Jay Zoldak committed Jul 11, 2014
  1999a726 Browse Files
- Disable failing video language test · dc14530a
  Jay Zoldak committed Jul 11, 2014
  
  dc14530a Browse Files
- Defensively checks that children exist in has_changes · cccb5cd7
  Ben McMorran committed Jul 11, 2014
  
  cccb5cd7 Browse Files
- Merge pull request #4387 from edx/markhoeber/documentation/doc-748 · b781013b
```
Added discussion label change to release notes
```
  Mark Hoeber committed Jul 11, 2014
  b781013b Browse Files
- Added discussion label change to release notes · 55769701
  Mark Hoeber committed Jul 11, 2014
  
  55769701 Browse Files
- Merge pull request #4376 from edx/ahodges/documentation/activestudents · fb18555a
```
New "Active Students" data on instructor dash
```
  Alison Hodges committed Jul 11, 2014
  fb18555a Browse Files
- New "Active Students" data on instructor dash · 208b24de
  Alison Hodges committed Jul 11, 2014
  
  208b24de Browse Files
- Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation · b0170a5c
```
Subsume browser links to variables, to exclude from translation
```
  Sarina Canelake committed Jul 11, 2014
  b0170a5c Browse Files
- Merge pull request #4297 from mlkwaqas/waqas/for122-anonymous-post-are-anonymous-to-staff · a9f751d9
```
Show thread user to staff when only anonymous_to_peers is true
```
  Waqas Khalid committed Jul 11, 2014
  a9f751d9 Browse Files
- Show thread user to staff when only anonymous_to_peers is true · 81dfcb04
```
FOR-122
```
  Waqas Khalid committed Jul 11, 2014
  81dfcb04 Browse Files
10 Jul, 2014 17 commits
- Subsume browser links to variables, to exclude from translation · 92381f0f
  Kevin Luo committed Jul 10, 2014
  
  92381f0f Browse Files
- Merge pull request #4377 from edx/ned/fix-pr-4168 · d94b9202
```
unicode fixes
```
  Ned Batchelder committed Jul 10, 2014
  d94b9202 Browse Files
- Remove an unneeded unicode conversion · 84cfea8e
  Ned Batchelder committed Jul 10, 2014
  
  84cfea8e Browse Files
- unicode fixes · cf16975b
  Abdallah committed Jul 10, 2014
  
  cf16975b Browse Files
- Merge pull request #4368 from lduarte1991/lduarte-harvardx-pr9 · e8d264f8
```
Annotation Tool: Removed color bug from Flagging and HighlightTags plugins
```
  Julia Hansbrough committed Jul 10, 2014
  e8d264f8 Browse Files
- Merge pull request #4172 from edx/cdodge/ecommerce-improvements · 665ccdb7
```
eCommerce enhancements
```
  chrisndodge committed Jul 10, 2014
  665ccdb7 Browse Files
- Merge pull request #4095 from edx/jtauber/open-edx-footer · 256c6bb4
```
Separate edX / Open edX footer
```
  James Tauber committed Jul 10, 2014
  256c6bb4 Browse Files
- Merge pull request #4367 from edx/sarina/i18n-course-handouts · 50709c16
```
i18n LMS and Studio components of course handouts
```
  Sarina Canelake committed Jul 10, 2014
  50709c16 Browse Files
- Separate edX / Open edX footer. · 3cb87802
```
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
```
  James Tauber committed Jul 10, 2014
  3cb87802 Browse Files
- Merge pull request #3858 from aboudreault/xblock-resource-missing-mimetypes · 177e8a24
```
Add missing mimetypes for xblock resources
```
  Julia Hansbrough committed Jul 10, 2014
  177e8a24 Browse Files
- Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki · d7e6f94a
```
Feature/fmo/microsite wiki
```
  James Tauber committed Jul 10, 2014
  d7e6f94a Browse Files
- i18n LMS and Studio components of course handouts · a5dc426c
  Sarina Canelake committed Jul 10, 2014
  
  a5dc426c Browse Files
- Annotation Tool: Removed conflict between tags-annotator and flagging-annotator · a5d8669f
  lduarte1991 committed Jul 10, 2014
  
  a5d8669f Browse Files
- Merge pull request #4321 from edx/ahodges/documentation/FOR595 · 19a3410b
```
Updated with UI and terminology changes
```
  Alison Hodges committed Jul 10, 2014
  19a3410b Browse Files
- Updated with UI changes in Studio and LMS, terminology · 5eb17f80
  Alison Hodges committed Jul 10, 2014
  
  5eb17f80 Browse Files
- Merge pull request #4312 from edx/ahodges/documentation/DOC158mslotke · 7d26594b
```
Edits from Michele
```
  Alison Hodges committed Jul 10, 2014
  7d26594b Browse Files
- Edits from Michele · e654c3dc
  Alison Hodges committed Jul 10, 2014
  
  e654c3dc Browse Files