Commits · aa1281456f874d635b8c748e8596dfcea5846c83 · edx / edx-platform

04 Nov, 2015 23 commits
- Merge pull request #10347 from edx/cptvitamin/TNL-3675 · aa128145
```
Fixes invalid/improper microdata and attribute values in the header logo
```
  Mark Sadecki committed Nov 04, 2015
  aa128145 Browse Files
- Merge pull request #10511 from edx/sarina/fix-contributing · ee95695c
```
Fix stale RTD links in CONTRIBUTING.rst OPEN-1047
```
  Sarina Canelake committed Nov 04, 2015
  ee95695c Browse Files
- Merge pull request #10484 from edx/robrap/TNL-2646 · b7698123
```
TNL-2646: Escape json in Studio
```
  Robert Raposa committed Nov 04, 2015
  b7698123 Browse Files
- Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes · acf5bb57
```
Course pacing template changes.
```
  Peter Fogg committed Nov 04, 2015
  acf5bb57 Browse Files
- Add json escaping to Studio · 3682fac8
```
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
```
  Robert Raposa committed Nov 04, 2015
  3682fac8 Browse Files
- Remove unused method subsection_handler · 0964bf28
```
Removing this particular call to json.dumps was done by removing
the complete method subsection_handler which is no longer
used.  The template edit_subsection.html had already been removed.

TNL-2646 Escape json
```
  Robert Raposa committed Nov 04, 2015
  0964bf28 Browse Files
- Fix stale RTD links in CONTRIBUTING.rst · 77ab13c9
  Sarina Canelake committed Nov 04, 2015
  
  77ab13c9 Browse Files
- Merge pull request #10490 from edx/release · 24ee5a68
```
Release 4 November 2015 to master
```
  Eric Fischer committed Nov 04, 2015
  24ee5a68 Browse Files
- Merge pull request #10416 from louyihua/underscore_ngettext · e46b4396
```
Fix underscore extraction error
```
  Sarina Canelake committed Nov 04, 2015
  e46b4396 Browse Files
- Merge pull request #10510 from edx/peter-fogg/update-cert-info-docstring · 31e609ff
```
Update `cert_info` docstring with correct return type.
```
  Peter Fogg committed Nov 04, 2015
  31e609ff Browse Files
- Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx · 01f1c3a1
```
Disabled auto enroll in ccx coach's enrollment tab
```
  Peter Pinch committed Nov 04, 2015
  01f1c3a1 Browse Files
- Merge pull request #10497 from edx/rc/2015-11-03 · ae7b44bb
```
Fixing cert_status None bug
```
  Eric Fischer committed Nov 04, 2015
  ae7b44bb Browse Files
- Update `cert_info` docstring with correct return type. · 13f20d56
  Peter Fogg committed Nov 04, 2015
  
  13f20d56 Browse Files
- Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure · 5bd6e829
```
Fix `withData` and `withConfiguration` helpers.
```
  Peter Fogg committed Nov 04, 2015
  5bd6e829 Browse Files
- Merge pull request #10487 from edx/renzo/ugettext-noop · b48b2b64
```
Where possible, use ugettext_noop instead of lambdas assigned to the underscore
```
  Sarina Canelake committed Nov 04, 2015
  b48b2b64 Browse Files
- Course pacing template changes. · b98c8911
```
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
```
  Peter Fogg committed Nov 04, 2015
  b98c8911 Browse Files
- Merge pull request #10500 from edx/ned/explain-why-prereqs-arent-installing · babd422f
```
If NO_PREREQ_INSTALL is set, print a message to explain why
```
  Ned Batchelder committed Nov 04, 2015
  babd422f Browse Files
- Use ugettext_noop instead of lambdas assigned to the underscore · 2f0e6635
```
Replaces instances of an old hack with the more clear ugettext_noop.
```
  Renzo Lucioni committed Nov 04, 2015
  2f0e6635 Browse Files
- Generify message. User will see context in previous console line. · a1bb822c
  Ben Patterson committed Nov 04, 2015
  
  a1bb822c Browse Files
- Merge pull request #10474 from edx/ned/django-pylint · 68182b13
```
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
```
  Ned Batchelder committed Nov 04, 2015
  68182b13 Browse Files
- Fix a underscore extraction error · c78b306a
```
ngettext and its parameters should not be separated into multiple lines.
```
  louyihua committed Nov 04, 2015
  c78b306a Browse Files
- Disabled auto enroll in ccx enrollment tab · 1f60e969
  Amir Qayyum Khan committed Nov 04, 2015
  
  1f60e969 Browse Files
- Fix cert_status None. Add GeneratedCertificate to admin · dc469ea5
  Eric Fischer committed Nov 03, 2015
  
  dc469ea5 Browse Files
03 Nov, 2015 17 commits
- Fix typo · cd3f8ded
  Andy Armstrong committed Nov 03, 2015
  
  cd3f8ded Browse Files
- If NO_PREREQ_INSTALL is set, print a message to explain why · 3f79dd0b
  Ned Batchelder committed Nov 03, 2015
  
  3f79dd0b Browse Files
- Use 0.3.2 of edx-lint, with pylint-django and C extensions read · 1f093ecc
  Ned Batchelder committed Nov 03, 2015
  
  1f093ecc Browse Files
- Merge pull request #10488 from edx/adam/disable-check-button-on-save-click · 59af66c6
```
Adam/disable check button on save click
```
  Adam committed Nov 03, 2015
  59af66c6 Browse Files
- Fixes invalid/improper microdata and attribute values in the header logo · 3be86ca8
  Mark Sadecki committed Nov 03, 2015
  
  3be86ca8 Browse Files
- Merge pull request #10442 from edx/rc/2015-11-03 · 0951dc39
```
Release 3 November 2015
```
  Eric Fischer committed Nov 03, 2015
  0951dc39 Browse Files
- add test for disabling check button while clicking save · bc6caea6
  Adam Palay committed Nov 03, 2015
  
  bc6caea6 Browse Files
- Disable submit button on save click · 99cca057
  Giulio Gratta committed Nov 03, 2015
  
  99cca057 Browse Files
- Merge pull request #10486 from edx/benp/more-better-doc · 79c2501c
```
Fix formatting.
```
  Ben Patterson committed Nov 03, 2015
  79c2501c Browse Files
- Fix formatting. · c0090358
  Ben Patterson committed Nov 03, 2015
  
  c0090358 Browse Files
- Merge pull request #10480 from edx/benp/update-bokchoy-docs · 74ef9dd0
```
Improve documentation for bok-choy.
```
  Ben Patterson committed Nov 03, 2015
  74ef9dd0 Browse Files
- Improve documentation for bok-choy. · 343d2856
```
Includes info about the serversonly/testsonly pattern, as well
as multiprocessing.
```
  Ben Patterson committed Nov 03, 2015
  343d2856 Browse Files
- Merge pull request #10482 from edx/robrap/SEC-27 · a85cc9e1
```
SEC-27: Escape json for Studio advanced settings
```
  Robert Raposa committed Nov 03, 2015
  a85cc9e1 Browse Files
- Merge pull request #10445 from stvstnfrd/chat · 1172a495
```
Remove chat feature
```
  Sarina Canelake committed Nov 03, 2015
  1172a495 Browse Files
- Escape json for Studio advanced settings · 44bd6529
```
- Resolve SEC-27 by escaping course name in advanced settings
- Add escape_json_dumps to simplify escaping json in Mako templates

SEC-27: XSS/JS Error in Advanced Settings with invalid course name
```
  Robert Raposa committed Nov 03, 2015
  44bd6529 Browse Files
- Merge pull request #10469 from edx/efischer/hotfix_management_command · a5473a4e
```
Post-migration management command
```
  Eric Fischer committed Nov 03, 2015
  a5473a4e Browse Files
- Post-migration management command · 3609cc7a
```
On devops recommendation, now handling the potential for an 'inconsistency
window' via a management command instead of a hacky "re-run the data migration"
bash script.
```
  Eric Fischer committed Nov 03, 2015
  3609cc7a Browse Files