Commits · 713c79e0aadb8253d87f642b9342ee21a4a5621f · edx / edx-platform · GitLab

05 May, 2016 15 commits
- Set included=false by default because we want to move towards RequireJs. · 713c79e0
  Usman Khalid committed May 05, 2016
  
  713c79e0 Browse Files
- Moved all logic from karma config files to karma.common.conf.js. · 855fdbd3
```
The config files just declare lists of files.
```
  Usman Khalid committed May 05, 2016
  855fdbd3 Browse Files
- Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. · ecf233c1
  Usman Khalid committed May 05, 2016
  
  ecf233c1 Browse Files
- Deleted js-test-tool config files. · bb7b29b3
  Usman Khalid committed May 05, 2016
  
  bb7b29b3 Browse Files
- Merge pull request #12333 from edx/sstudent/MA-2252 · db52e033
```
Sstudent/ma 2252
```
  sanfordstudent committed May 05, 2016
  db52e033 Browse Files
- Merge pull request #12375 from edx/ned/update-translations · 850bc6bb
```
Update translations (autogenerated message)
```
  Ned Batchelder committed May 05, 2016
  850bc6bb Browse Files
- Update translations (autogenerated message) · 190c2ffc
  Ned Batchelder committed May 05, 2016
  
  190c2ffc Browse Files
- accordion emits event · d4146e7a
  Sanford Student committed May 05, 2016
  
  d4146e7a Browse Files
- Merge pull request #12372 from edx/feature/catalog-admin · 4a417f28
```
Merge catalog admin into master.
```
  Peter Fogg committed May 05, 2016
  4a417f28 Browse Files
- Merge pull request #12363 from edx/peter-fogg/fix-api-email · e6f3af65
```
Correctly pull in API access email config.
```
  Peter Fogg committed May 05, 2016
  e6f3af65 Browse Files
- Merge pull request #12339 from edx/e0d/update-libary · ce7d4f03
```
Bump SAML version.
```
  Edward Zarecor committed May 05, 2016
  ce7d4f03 Browse Files
- 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 22 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
- Correctly pull in API access email config. · 268cb2ea
  Peter Fogg committed May 04, 2016
  
  268cb2ea 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 #12265 from edx/peter-fogg/catalog-admin-ui · 85a6954d
```
Catalog admin UI.
```
  Peter Fogg committed May 04, 2016
  85a6954d 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
- Flesh out UI now that the backend is there. · bcde8e55
  Peter Fogg committed May 04, 2016
  
  bcde8e55 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 3 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