Commits · 07fb1645aafa82b1699249d77162434b21a34d4c · edx / edx-platform · GitLab

06 May, 2016 11 commits
- Merge pull request #12381 from edx/clintonb/credit-fix · 07fb1645
```
Multiple Credit Fixes
```
  Clinton Blackburn committed May 06, 2016
  07fb1645 Browse Files
- Merge pull request #12361 from edx/benp/skip-extra-flaky-tests-fedx-88 · 16213573
```
Skip tests that are too flaky to be reliable. FEDX-88.
```
  Ben Patterson committed May 06, 2016
  16213573 Browse Files
- Merge pull request #12387 from edx/zoldak/update-jshint-threshold · 611222fb
```
Lower the jshint threshold to 7550
```
  Jesse Zoldak committed May 06, 2016
  611222fb Browse Files
- Skip tests that are too flaky to be reliable. FEDX-88. · 72af8afd
  Ben Patterson committed May 06, 2016
  
  72af8afd Browse Files
- Updated credit requirements logic · bcd762ef
```
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
```
  Clinton Blackburn committed May 06, 2016
  bcd762ef Browse Files
- Merge pull request #12124 from edx/diana/conditional-transaction · 2c12decc
```
Convert conditional module test to bok choy
```
  Diana Huang committed May 06, 2016
  2c12decc Browse Files
- Lower the jshint threshold to 7550 · d7e9db66
  Jesse Zoldak committed May 06, 2016
  
  d7e9db66 Browse Files
- Replace old conditional lettuce test with bok choy version. · 07573c51
  Diana Huang committed May 06, 2016
  
  07573c51 Browse Files
- Credit test cleanup · 9b24735c
```
Removed a lot of duplicate code!

ECOM-4379
```
  Clinton Blackburn committed May 06, 2016
  9b24735c Browse Files
- Exposing CreditRequirement and CreditRequirementStatus in admin · 51715b9e
```
ECOM-4379
```
  Clinton Blackburn committed May 06, 2016
  51715b9e Browse Files
- Merge pull request #11922 from edx/jibsheet/html-escape-activation · 61ef49b9
```
Enable safe by default in the activation flow
```
  Kevin Falcone committed May 05, 2016
  61ef49b9 Browse Files
05 May, 2016 26 commits
- Enable safe by default in the activation flow · 15e88293
```
The largest changes here were around HTML escaping in the translations.
```
  Kevin Falcone committed May 05, 2016
  15e88293 Browse Files
- Merge pull request #12379 from edx/schen/ECOM-4352 · 759ad2ea
```
ECOM-4352 Update the min height of the title of the program cards
```
  Simon Chen committed May 05, 2016
  759ad2ea Browse Files
- ECOM-4352 Update the min height of the title of the program cards · e13ab680
  Simon Chen committed May 05, 2016
  
  e13ab680 Browse Files
- Merge pull request #12344 from edx/usman/tnl4398-karma-config-improvements · 8b645754
```
Karma config improvements.
```
  Usman Khalid committed May 05, 2016
  8b645754 Browse Files
- Added some documentation to Karma configuration files. · a2dadeaa
  Usman Khalid committed May 05, 2016
  
  a2dadeaa Browse Files
- Moved common files into karma.common.conf.js. · 667a9b9a
  Usman Khalid committed May 05, 2016
  
  667a9b9a Browse Files
- Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. · 6ed93538
  Usman Khalid committed May 05, 2016
  
  6ed93538 Browse Files
- Simplified normalizePathsForCoverage. · 39f32f98
  Usman Khalid committed May 05, 2016
  
  39f32f98 Browse Files
- Moved jasmine addons to common/js/spec_helpers. · 2839a42e
  Usman Khalid committed May 05, 2016
  
  2839a42e Browse Files
- Exclude translation files from coverage tracking. · 84412ef8
  Usman Khalid committed May 05, 2016
  
  84412ef8 Browse Files
- Simplify paths patterns in karma config files. · 15acec20
```
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
```
  Usman Khalid committed May 05, 2016
  15acec20 Browse Files
- 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 3 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