Commits · bf298f9bed67c57c6acfdc0a9b59d03800200181 · edx / edx-platform · GitLab

03 Nov, 2014 5 commits
- Merge pull request #5832 from edx/sarina/20141103-update-translations · bf298f9b
```
Update translations '
```
  Sarina Canelake committed Nov 03, 2014
  bf298f9b Browse Files
- Update translations ' · 67ebd5ec
```
(autogenerated message)
```
  Sarina Canelake committed Nov 03, 2014
  67ebd5ec Browse Files
- Merge pull request #5808 from edx/zub/bugfix/tnl-138-createunitthrowserror · 7f98540e
```
fix click event for actual target
```
  Christina Roberts committed Nov 03, 2014
  7f98540e Browse Files
- Merge pull request #5782 from edx/remove-analytics-demographics · 22952af6
```
Updates to Demographics Display
```
  Clinton Blackburn committed Nov 03, 2014
  22952af6 Browse Files
- fix click event for actual target · dd71ca0f
```
TNL-138
```
  zubair-arbi committed Nov 03, 2014
  dd71ca0f Browse Files
31 Oct, 2014 18 commits
- Merge pull request #5820 from rocha/dont-raise-error-on-course-export-command-cleanup · 09c1f524
```
Ignore errors during cleanup of course export command.
```
  Carlos Andrés Rocha committed Oct 31, 2014
  09c1f524 Browse Files
- Merge pull request #5811 from edx/carol/docs/DOC-977 · 9610c3b2
```
Add warning about sensitive info in course export
```
  Carol Tong committed Oct 31, 2014
  9610c3b2 Browse Files
- Ignore errors during cleanup of course export command. · 6ad235f5
  Carlos Andrés Rocha committed Oct 31, 2014
  
  6ad235f5 Browse Files
- Update change log for export security warning · 6cecfd0f
```
DOC-977
```
  Carol Tong committed Oct 31, 2014
  6cecfd0f Browse Files
- Merge pull request #5818 from edx/release · 9f3b9c7b
```
Merging latest updates to release
```
  Martyn James committed Oct 31, 2014
  9f3b9c7b Browse Files
- Add warning about sensitive info in course export · 254777f4
```
DOC-977/DOC-991
```
  Carol Tong committed Oct 31, 2014
  254777f4 Browse Files
- Merge pull request #5804 from edx/cdodge/fix-receipt-link · 640072a6
```
fix the link in the button on the receipt page
```
  chrisndodge committed Oct 31, 2014
  640072a6 Browse Files
- Merge pull request #5799 from edx/hotfix_candidate/2014-10-30 · 1d4c781e
```
Merging Hotfix candidate/2014 10 30 as per release process
```
  Martyn James committed Oct 31, 2014
  1d4c781e Browse Files
- Merge pull request #5726 from edx/sarina/fix-wording-reset-button · f76288c0
```
Update wording per Doc
```
  Sarina Canelake committed Oct 31, 2014
  f76288c0 Browse Files
- Revert "Fix lettuce css_fill method for devstack" · 71f237d3
```
This reverts commit 471abb8c.
```
  Jesse Zoldak committed Oct 31, 2014
  71f237d3 Browse Files
- Fix lettuce css_fill method for devstack · 471abb8c
  Jesse Zoldak committed Oct 31, 2014
  
  471abb8c Browse Files
- Merge pull request #5794 from edx/adam/shorten-title-width · 47c445db
```
courseware header bar should not overflow shopping cart button TNL-722
```
  Adam committed Oct 31, 2014
  47c445db Browse Files
- Merge pull request #5806 from edx/ammar/te-567 · b82167f7
```
Correct script exit status
```
  Muhammad Ammar committed Oct 31, 2014
  b82167f7 Browse Files
- Merge pull request #5750 from edx/frances/fix/receipt-layout-fixes · 69867159
```
Verified Receipt page layout fixes
```
  frances botsford committed Oct 31, 2014
  69867159 Browse Files
- Merge pull request #5291 from fmyzjs/s3_storgae · 7d2a2f89
```
When s3fs cannot be accessed replaced with osfs
```
  Feanil Patel committed Oct 31, 2014
  7d2a2f89 Browse Files
- Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system · b4562ffe
```
Fix PLAT-191
```
  Calen Pennington committed Oct 31, 2014
  b4562ffe Browse Files
- Correct script exit status · ac8c6d18
```
TE-567
```
  muhammad-ammar committed Oct 31, 2014
  ac8c6d18 Browse Files
- fix the link in the button on the receipt page · 8b25a4c1
  Chris Dodge committed Oct 30, 2014
  
  8b25a4c1 Browse Files
30 Oct, 2014 17 commits
- Merge pull request #5803 from Stanford-Online/caijim/resetbutton · 074c0968
```
Commenting out flaky string input test case
```
  Jesse Zoldak committed Oct 30, 2014
  074c0968 Browse Files
- Commenting out flaky string input test case · 3ceb0e5c
  Jim committed Oct 30, 2014
  
  3ceb0e5c Browse Files
- Merge pull request #5724 from edx/zoldak/improve-rerun-test · 7ca78d6e
```
Improve rerun test
```
  Jesse Zoldak committed Oct 30, 2014
  7ca78d6e Browse Files
- Merge pull request #5765 from edx/carol/docs/DOC-1100 · 97d9d956
```
Add email template for verified certificate date
```
  Carol Tong committed Oct 30, 2014
  97d9d956 Browse Files
- Add email template for verified certificate date · 41b16452
  Carol Tong committed Oct 30, 2014
  
  41b16452 Browse Files
- Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding… · 4007d5eb
```
Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards

[PLAT-191]
```
  Calen Pennington committed Oct 30, 2014
  4007d5eb Browse Files
- Merge pull request #5538 from edx/adam/generalized-draft-import-export-2 · 75fab0cc
```
Adam/generalized draft import export 2
```
  Adam committed Oct 30, 2014
  75fab0cc Browse Files
- Merge pull request #5764 from edx/dan-f/highlight-active-unit-in-outline · 355a3b45
```
Highlight active unit in studio container page's outline
```
  Daniel Friedman committed Oct 30, 2014
  355a3b45 Browse Files
- Add the ability for course staff to specify a Survey and make it required so… · fea9432b
```
Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course
```
  Chris Dodge committed Oct 30, 2014
  fea9432b Browse Files
- Merge pull request #5792 from edx/sarina/i18n · 3d7ce0bb
```
Fix i18n and quality errors in course_groups/views.py
```
  Sarina Canelake committed Oct 30, 2014
  3d7ce0bb Browse Files
- Merge pull request #5769 from edx/ahodges/doc/DOC491 · fc2906da
```
Corrected link to Developer's guide
```
  Alison Hodges committed Oct 30, 2014
  fc2906da Browse Files
- Corrected link to Developer's guide · fc89ccaa
```
@mhoeber , @stroilova
```
  Alison Hodges committed Oct 30, 2014
  fc89ccaa Browse Files
- generalize draft import/export TNL-574 · a6c31fc4
```
add test for videomodule

Import drafts handles modules w/o xml_attributes
and ones using the old parent_sequential_url pointer

Handle drafts for modules which don't define nor extract xml_attributes

Support  and  in get_items qualifiers

Unit test for   value query
```
  Adam Palay committed Oct 30, 2014
  a6c31fc4 Browse Files
- courseware header bar should not overflow shopping cart button TNL-722 · 6a40ed1d
  Adam Palay committed Oct 30, 2014
  
  6a40ed1d Browse Files
- Fix i18n and quality errors in course_groups/views.py · 1b6d1b37
  Sarina Canelake committed Oct 30, 2014
  
  1b6d1b37 Browse Files
- Show current unit in unit outline. · 3b3b3dcd
```
TNL-291
```
  Daniel Friedman committed Oct 30, 2014
  3b3b3dcd Browse Files
- Studio: correcting minor Sass indent and property syntax issues · a4e1cc48
  Brian Talbot committed Oct 30, 2014
  
  a4e1cc48 Browse Files