Commits · 38f1c200cae46a704fa063b72c8208d2d5ed14e5 · edx / edx-platform · GitLab

09 May, 2016 1 commit
- Fixing test · 38f1c200
  Awais Jibran committed May 09, 2016
  
  38f1c200 Browse Files
06 May, 2016 1 commit
- Studio Edge cannot load the Course Dashboard for CCX courses. · e6b3f8f8
```
TNL-4484
```
  Awais Jibran committed May 06, 2016
  e6b3f8f8 Browse Files
05 May, 2016 4 commits
- Merge pull request #12366 from edx/douglashall/microsite_platform_name · 1feb4fdb
```
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
```
  Douglas Hall committed May 05, 2016
  1feb4fdb Browse Files
- Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting · 53604648
  Douglas Hall committed May 04, 2016
  
  53604648 Browse Files
- Merge pull request #12365 from edx/release-2016-05-03-conflict · 546f5f3d
```
Merging release 2016-05-03 into master
```
  Clinton Blackburn committed May 04, 2016
  546f5f3d Browse Files
- Merge branch 'release' into release-2016-05-03-conflict · 868d9620
  Clinton Blackburn committed May 04, 2016
  
  868d9620 Browse Files
04 May, 2016 19 commits
- Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update · 816882a1
```
Alasdair/ecom 4338 program progress a11y update
```
  AlasdairSwan committed May 04, 2016
  816882a1 Browse Files
- Merge pull request #12362 from edx/douglashall/fix_logistration_platform_name_display · 2a8f44ad
```
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
```
  Douglas Hall committed May 04, 2016
  2a8f44ad Browse Files
- Merge pull request #12357 from edx/ned/registered-trademark · ff9e9d8b
```
Add a circle-R to the initial welcome message
```
  Ned Batchelder committed May 04, 2016
  ff9e9d8b Browse Files
- Merge branch 'master' into douglashall/fix_logistration_platform_name_display · f914c44b
  Douglas Hall committed May 04, 2016
  
  f914c44b Browse Files
- UPdated a11y approach for program card progress bars · f5d24994
  AlasdairSwan committed May 04, 2016
  
  f5d24994 Browse Files
- Add a circle-R to the initial welcome message · 16fbad3f
  Ned Batchelder committed May 04, 2016
  
  16fbad3f Browse Files
- Merge pull request #12360 from edx/christina/tnl-4238 · 8127158e
```
Fix incorrect truncation issue.
```
  Christina Roberts committed May 04, 2016
  8127158e Browse Files
- Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting · e97fa49b
  Douglas Hall committed May 04, 2016
  
  e97fa49b Browse Files
- Fix incorrect truncation issue. · b1f71569
```
TNL-4238
```
  cahrens committed May 04, 2016
  b1f71569 Browse Files
- Merge pull request #12307 from edx/rc/2016-05-03 · d6f68ca5
```
Release Candidate rc/2016-05-03
```
  Clinton Blackburn committed May 04, 2016
  d6f68ca5 Browse Files
- Merge pull request #12356 from edx/karma · 6055205d
```
JS tests no longer use js-test-tool
```
  Brian Jacobel committed May 04, 2016
  6055205d Browse Files
- Merge pull request #12343 from edx/afzaledx/SOL-1780-increased-in-exam-polling-interval · 6ba7133b
```
Bumped the proctoring version.
```
  Douglas Hall committed May 04, 2016
  6ba7133b Browse Files
- Merge pull request #12351 from edx/clrux/ac-452 · 972cee48
```
AC-452 removing unnecessary and incorrect aria-label
```
  clrux committed May 04, 2016
  972cee48 Browse Files
- Path update for Karma debug runner · df32d2a1
  Brian Jacobel committed May 04, 2016
  
  df32d2a1 Browse Files
- JS tests no longer use js-test-tool · 1d49dd9d
  Brian Jacobel committed May 04, 2016
  
  1d49dd9d Browse Files
- Merge pull request #12283 from edx/PERF-317 · 00cbc291
```
Add NewRelic instrumentation to contentserver.
```
  Toby Lawrence committed May 04, 2016
  00cbc291 Browse Files
- Merge pull request #12312 from edx/usman/tnl4398-fix-tests · d9997887
```
Re-enable spec files that were disabled during the Jasmine upgrade.
```
  Usman Khalid committed May 04, 2016
  d9997887 Browse Files
- Merge pull request #12355 from edx/clrux/rc-2016-05-03-progress_fix · 0bf5a3d7
```
Moving main element up higher to not conflict with chart
```
  clrux committed May 03, 2016
  0bf5a3d7 Browse Files
- Moving main element up higher to not conflict with chart · cf0b8098
  Chris Rodriguez committed May 03, 2016
  
  cf0b8098 Browse Files
03 May, 2016 15 commits
- 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
- AC-452 removing unnecessary and incorrect aria-label · 0723b982
  Chris Rodriguez committed May 03, 2016
  
  0723b982 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
- Merge pull request #12349 from edx/clrux/rc-2016-05-03-display_issue · a5237c1b
```
Overriding display table-cell on instructor dashboard
```
  clrux committed May 03, 2016
  a5237c1b Browse Files