Commits · 1b3f3b9d4e9b092da4fe80e8eb7cb21e75bba893 · edx / edx-platform · GitLab

03 May, 2016 22 commits
- New branch for continued Course Catalog API work · 1b3f3b9d
  Sylvia Pearce committed May 03, 2016
  
  1b3f3b9d Browse Files
- Merge pull request #12322 from edx/malikshahzad228/additional_course_fields · da5b9728
```
WL-401 Add CourseDetails model to course_about template context
```
  Douglas Hall committed May 03, 2016
  da5b9728 Browse Files
- Merge pull request #12352 from edx/robrap/linter-false-positives-3 · 24ad0059
```
Fix Python false positives with AST.
```
  Robert Raposa committed May 03, 2016
  24ad0059 Browse Files
- Merge pull request #12337 from edx/douglashall/SOL-1777/fix_gating_with_library_content · e1400459
```
SOL-1777 Allow content gating to work with library_content blocks
```
  Douglas Hall committed May 03, 2016
  e1400459 Browse Files
- Fix Python false positives with AST. · 60d11bf2
```
- Use AST to parse Python.
- Refactor Mako to use Python linting.
- Add optional verbose script argument.
- Skip tests.py files when linting.
```
  Robert Raposa committed May 03, 2016
  60d11bf2 Browse Files
- Merge branch 'master' into malikshahzad228/additional_course_fields · f5223a36
  Douglas Hall committed May 03, 2016
  
  f5223a36 Browse Files
- Merge pull request #12324 from edx/tasawer/story/ecom-3731-update-browse-new-courses-area · 6d315a9a
```
Update browser new course area
```
  tasawernawaz committed May 04, 2016
  6d315a9a Browse Files
- Allow content gating to work with library_content blocks · c7b2d987
  Douglas Hall committed May 03, 2016
  
  c7b2d987 Browse Files
- Merge pull request #12350 from edx/christina/instructor-dashboard-xss · 5b26a2f7
```
Clean up HTML encoding.
```
  Christina Roberts committed May 03, 2016
  5b26a2f7 Browse Files
- Merge pull request #12316 from edx/alasdair/ECOM-4315-edx.org-pattern-library-page-footer · bd285997
```
ECOM-4313 Styled footer on pattern library pages
```
  AlasdairSwan committed May 03, 2016
  bd285997 Browse Files
- Add CourseDetails model to course_about template context. · d64e4b06
  Malik Shahzad committed May 03, 2016
  
  d64e4b06 Browse Files
- Merge pull request #12335 from edx/christina/tnl-4193 · ce53392a
```
HTML-encode string values in keyword substitution.
```
  Christina Roberts committed May 03, 2016
  ce53392a Browse Files
- Merge pull request #11331 from CredoReference/invalid-studio-user-permissions · b5ab6450
```
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
```
  John Eskew committed May 03, 2016
  b5ab6450 Browse Files
- Merge pull request #12326 from edx/christina/delete-old-jasmine-jquery · 04b80f04
```
Jasmine-jquery was moved to npm.
```
  Christina Roberts committed May 03, 2016
  04b80f04 Browse Files
- HTML-encode string values in keyword substitution. · 76545ef4
```
TNL-4193
```
  cahrens committed May 03, 2016
  76545ef4 Browse Files
- Clean up HTML encoding. · f0f7cf4d
  cahrens committed May 03, 2016
  
  f0f7cf4d Browse Files
- Merge pull request #12267 from edx/tnl/refactor_courseware_index · 0b6da4cd
```
Refactor courseware index
```
  Nimisha Asthagiri committed May 03, 2016
  0b6da4cd Browse Files
- ECOM-3731 update browser new course area · 4a18ec80
  Tasawer committed May 03, 2016
  
  4a18ec80 Browse Files
- Styled footer on pattern library pages · 2c8f3c80
  AlasdairSwan committed May 03, 2016
  
  2c8f3c80 Browse Files
- Merge pull request #12278 from edx/christina/cohort-messages · f0f06450
```
Add messaging when verified track content MVP is enabled.
```
  Christina Roberts committed May 03, 2016
  f0f06450 Browse Files
- Create courseware/views folder · c6954902
  Nimisha Asthagiri committed May 03, 2016
  
  c6954902 Browse Files
- Refactor Courseware Index · 2f581448
```
MA-2189
```
  Nimisha Asthagiri committed May 03, 2016
  2f581448 Browse Files
02 May, 2016 18 commits
- Remove second page tag. · 0f8b2452
  cahrens committed May 02, 2016
  
  0f8b2452 Browse Files
- Merge pull request #12319 from edx/robrap/linter-move-mako · b1313671
```
Move MakoTemplateLinter.
```
  Robert Raposa committed May 02, 2016
  b1313671 Browse Files
- Add messaging when verified track content MVP is enabled. · 9b28afb7
```
TNL-4393
```
  cahrens committed May 02, 2016
  9b28afb7 Browse Files
- Merge pull request #12279 from edx/clrux/ac-448 · 15fc53c7
```
AC-448 removing tabindex from canvas elements
```
  clrux committed May 02, 2016
  15fc53c7 Browse Files
- Merge pull request #12328 from edx/ned/openedx-is-an-adjective · a03ab994
```
Reduce the use of 'Open edX' as a noun
```
  Ned Batchelder committed May 02, 2016
  a03ab994 Browse Files
- Merge pull request #12332 from edx/merge_patch-2016-05-02_into_master · 1fc70380
```
Merge patch 2016 05 02 into master
```
  Douglas Hall committed May 02, 2016
  1fc70380 Browse Files
- Merge remote-tracking branch 'origin/release' into merge_patch-2016-05-02_into_master · 735d82ba
  Douglas Hall committed May 02, 2016
  
  735d82ba Browse Files
- Reduce the use of 'Open edX' as a noun · 1a2ba1a5
  Ned Batchelder committed May 02, 2016
  
  1a2ba1a5 Browse Files
- Merge pull request #12318 from edx/hotfix/2016-05-02 · 2d6604a0
```
Patch Release 2016-05-02 WL Studio Course Details Fields
```
  Douglas Hall committed May 02, 2016
  2d6604a0 Browse Files
- Merge pull request #12275 from edx/ormsbee/video_state_opt_2 · f3b33ef1
```
Remove unnecessary VideoModule save_states.
```
  David Ormsbee committed May 02, 2016
  f3b33ef1 Browse Files
- Jasmine-jquery was moved to npm. · d9bb2068
  cahrens committed May 02, 2016
  
  d9bb2068 Browse Files
- Merge pull request #12290 from edx/zub/ecom-4281-add-receipt-page-analytics-event-js-test · dde18c7e
```
Add js test for analytics event on LMS receipt page
```
  Ahsan Ulhaq committed May 02, 2016
  dde18c7e Browse Files
- Merge pull request #12321 from edx/revert-10705-mrehan/SUST-22 · 7a6278e6
```
Revert "Implement 'from_string_or_404' in utils"
```
  Ayub khan committed May 02, 2016
  7a6278e6 Browse Files
- AC-448 updating tabindex from 1 to 0 (zero) · 817449c7
  Chris Rodriguez committed May 02, 2016
  
  817449c7 Browse Files
- Revert "Implement 'from_string_or_404' in utils" · d45c4d8c
  Ayub khan committed May 02, 2016
  
  d45c4d8c Browse Files
- Move MakoLinter. · fb13dc64
  Robert Raposa committed May 02, 2016
  
  fb13dc64 Browse Files
- Add js test for analytics event on LMS receipt page · f995114d
```
ECOM-4281
```
  Ahsan Ulhaq committed May 02, 2016
  f995114d Browse Files
- WL-399 Course Details List Fields · 59f70cf8
  asadiqbal committed May 01, 2016
  
  59f70cf8 Browse Files