Commits · a51143fe38ec03043d87a946c8a247ba726a472f · edx / edx-platform · GitLab

09 May, 2016 1 commit
- fix height of delete button to match the attached text field · a51143fe
  Ibrahim committed May 09, 2016
  
  a51143fe Browse Files
07 May, 2016 1 commit
- Merge pull request #12399 from edx/merge-patch-2016-05-06-into-master · 5496ec2a
```
Merge patch 2016 05 06 into master
```
  Douglas Hall committed May 07, 2016
  5496ec2a Browse Files
06 May, 2016 24 commits
- Merge remote-tracking branch 'origin/release' into merge-patch-2016-05-06-into-master · a90840a5
  Douglas Hall committed May 06, 2016
  
  a90840a5 Browse Files
- Merge pull request #12367 from edx/rc/2016-05-05 · e4ed23fa
```
Patch Release 2016-05-05
```
  Douglas Hall committed May 06, 2016
  e4ed23fa Browse Files
- Merge pull request #12311 from edx/carol/doc/DOC-2862_All · 26ea2dff
```
DOC-2862: Add doc for Courses API
```
  Carol Tong committed May 06, 2016
  26ea2dff Browse Files
- Merge pull request #12389 from edx/renzo/fix-sprintf-bug · 0a61ab75
```
Revert "Add js test for analytics event on LMS receipt page"
```
  Renzo Lucioni committed May 06, 2016
  0a61ab75 Browse Files
- Merge pull request #12346 from edx/jeskew/django_upgrade_1_8_13 · e50c6608
```
Upgrade to Django 1.8.13
```
  John Eskew committed May 06, 2016
  e50c6608 Browse Files
- Add documentation for Courses API · a1394e99
  Carol Tong committed May 06, 2016
  
  a1394e99 Browse Files
- Merge pull request #12205 from cpennington/disable-caching-in-tests · ccaafce0
```
Disable caching in LMS tests
```
  Calen Pennington committed May 06, 2016
  ccaafce0 Browse Files
- corrects guide name in template · a422ad60
  Alison Hodges committed May 06, 2016
  
  a422ad60 Browse Files
- Merge pull request #12382 from edx/ahodges/DOC-2866 · 289a4a2a
```
Updates link to learner info in Numerical Input template
```
  Alison Hodges committed May 06, 2016
  289a4a2a Browse Files
- Revert "Add js test for analytics event on LMS receipt page" · c697986a
```
This reverts commit f995114d.
```
  Renzo Lucioni committed May 06, 2016
  c697986a Browse Files
- Merge pull request #12334 from edx/adam/escape-library-html-only · 97a893ef
```
escape library.html
```
  Adam committed May 06, 2016
  97a893ef Browse Files
- 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
- escape library.html · 9ea24bf5
```
show_children_previews was not being evaluated before
```
  Adam Palay committed May 06, 2016
  9ea24bf5 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
- Updates link to learner info in Numerical Input template · afc56863
  Alison Hodges committed May 05, 2016
  
  afc56863 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 14 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