Commits · 519ebed615bdc095979cb3b1332b3e975625822d · edx / edx-platform

20 Jun, 2016 9 commits
- Merge pull request #12780 from edx/andya/remove-coffeescript · 519ebed6
```
Convert XBlock runtime code from CoffeeScript
```
  Andy Armstrong committed Jun 20, 2016
  519ebed6 Browse Files
- Merge pull request #12754 from edx/clrux/package-version-bump-for-a11y · 93850baf
```
Bumping version of a11y custom ruleset
```
  Chris committed Jun 20, 2016
  93850baf Browse Files
- Merge pull request #12775 from edx/asadiqbal08/WL-515 · a9cfa746
```
WL-515 Update Activate Account message page
```
  Matt Drayer committed Jun 20, 2016
  a9cfa746 Browse Files
- Merge pull request #12749 from cpennington/jenkins-concurrent-unit-tests · 6222b1cd
```
Jenkins concurrent unit tests
```
  Calen Pennington committed Jun 20, 2016
  6222b1cd Browse Files
- Clean up documentation about test concurrency · b839b048
  Calen Pennington committed Jun 20, 2016
  
  b839b048 Browse Files
- Convert verbosity number into an integer · c2fc9458
  Calen Pennington committed Jun 20, 2016
  
  c2fc9458 Browse Files
- Enable multiprocess tests on LMS tests in jenkins · 08fd3ac5
  Calen Pennington committed Jun 20, 2016
  
  08fd3ac5 Browse Files
- Enable coverage.py measurement of multiprocess tests · dcf5fd3e
  Calen Pennington committed Jun 20, 2016
  
  dcf5fd3e Browse Files
- WL-515 Update Activate Account message page · 4e38b2e4
  asadiqbal committed Jun 20, 2016
  
  4e38b2e4 Browse Files
19 Jun, 2016 1 commit
- Convert XBlock runtime code to JavaScript · fff88151
  Andy Armstrong committed Jun 19, 2016
  
  fff88151 Browse Files
17 Jun, 2016 14 commits
- Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs · df399de1
```
Converting views/tabs.coffee in the cms to js
```
  Andy Armstrong committed Jun 17, 2016
  df399de1 Browse Files
- Merge pull request #12764 from edx/yro-add_val_duplicate_video · f7010582
```
Add VAL "Duplicate" status
```
  Gregory Martin committed Jun 17, 2016
  f7010582 Browse Files
- Bumping version of a11y custom ruleset · fe5e5507
  Chris Rodriguez committed Jun 17, 2016
  
  fe5e5507 Browse Files
- Merge pull request #12729 from edx/clrux/bumping-bokchoy · a7bd5295
```
Bumping bok-choy to pick up a11y changes
```
  Chris committed Jun 17, 2016
  a7bd5295 Browse Files
- Merge pull request #12791 from edx/ibrahimahmed443/WL-529-platform-name-theme-override · 75945b8c
```
replace references to settings.PLATFORM_NAME in edx-platform with the…
```
  Douglas Hall committed Jun 17, 2016
  75945b8c Browse Files
- Merge pull request #12786 from edx/clintonb/catalog-admin-csv · b89fc917
```
Added CSV catalog downloads
```
  Clinton Blackburn committed Jun 17, 2016
  b89fc917 Browse Files
- replace references to settings.PLATFORM_NAME in edx-platform with theme overrides · 603546a0
  Ibrahim committed Jun 17, 2016
  
  603546a0 Browse Files
- Merge pull request #12785 from edx/douglashall/WL-531 · 6705677b
```
WL-531 Pass purchase_workflow parameter through to post-FinishAuth views
```
  Douglas Hall committed Jun 17, 2016
  6705677b Browse Files
- Corrected JWT data type · eab057c8
```
ECOM-4653
```
  Clinton Blackburn committed Jun 16, 2016
  eab057c8 Browse Files
- Added links to download catalog CSVs in API admin tool · 372c59e4
```
ECOM-4729
```
  Clinton Blackburn committed Jun 16, 2016
  372c59e4 Browse Files
- Removed unused template file · ecf44bbe
```
ECOM-4729
```
  Clinton Blackburn committed Jun 16, 2016
  ecf44bbe Browse Files
- Corrected Course Catalog API URL · 88049309
```
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
```
  Clinton Blackburn committed Jun 16, 2016
  88049309 Browse Files
- Converting views/tabs.coffee in the cms to js · 43ea4e21
```
Linting the compiled file
```
  Felipe Montoya committed Jun 16, 2016
  43ea4e21 Browse Files
- Pass purchase_workflow parameter through to post-FinishAuth views · 2717167f
  Douglas Hall committed Jun 16, 2016
  
  2717167f Browse Files
16 Jun, 2016 13 commits
- Merge pull request #12784 from edx/release · 5f159591
```
Release to Master (2016-06-16 hotfix)
```
  David Ormsbee committed Jun 16, 2016
  5f159591 Browse Files
- update_in_cache on lms worker (#12689) · fdc6d915
```
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
```
  Eric Fischer committed Jun 16, 2016
  fdc6d915 Browse Files
- Merge pull request #12778 from edx/hotfix/2016-06-16 · 53712a60
```
Create forums config model for adjusting connection timeouts.
```
  David Ormsbee committed Jun 16, 2016
  53712a60 Browse Files
- Create forums config model for adjusting connection timeouts. · 255267d4
  David Ormsbee committed Jun 16, 2016
  
  255267d4 Browse Files
- Merge pull request #12776 from edx/benp/remove-invalid-scss-calc · d544340f
```
Remove invalid css syntax.
```
  Ben Patterson committed Jun 16, 2016
  d544340f Browse Files
- Merge pull request #12779 from edx/ned/update-translations · b1c15af3
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jun 16, 2016
  b1c15af3 Browse Files
- Merge pull request #12774 from edx/benp/fix-scss-typo-shoppingcart · 28a01a4d
```
Remove improper scss syntax.
```
  Ben Patterson committed Jun 16, 2016
  28a01a4d Browse Files
- Merge pull request #12769 from edx/release · 7e55cc26
```
Merging Patch Release 2016-06-15 back to master
```
  Douglas Hall committed Jun 16, 2016
  7e55cc26 Browse Files
- Update translations (autogenerated message) · 25c195d4
  Ned Batchelder committed Jun 16, 2016
  
  25c195d4 Browse Files
- Remove invalid css syntax. · 1044dd59
```
This line can safely be removed since it does not impact
styling (nothing is being supplied to calculate).

Reference [here](http://www.w3schools.com/cssref/func_calc.asp)
```
  Ben Patterson committed Jun 16, 2016
  1044dd59 Browse Files
- Remove improper scss syntax. · 602380e5
```
This was a typo that was missed, and is not resulting in any styling.

Removing it is a no-op.

The original committer does not work in this code anymore, and
it is old enough such that changing it would be more disruptive.
```
  Ben Patterson committed Jun 16, 2016
  602380e5 Browse Files
- Merge pull request #12378 from edx/usman/atomic-refinement · 08a4d11d
```
A more considerate outer_atomic.
```
  Muzaffar yousaf committed Jun 16, 2016
  08a4d11d Browse Files
- Added a named outer_atomic option. · 78162320
```
A named outer is suitable when dealing with IntegrityErrors. It only
checks that it is not nested under an atomic only if it is nested
under enable_outer_atomic(name=<name>). This way only the view which
is causing IntegrityErrors needs to have its automatic transaction
management disabled and other callers are not effected.
```
  Usman Khalid committed Jun 16, 2016
  78162320 Browse Files
15 Jun, 2016 3 commits
- Merge pull request #12759 from edx/waheed/ecom-2378-change-refund-log-level · 70a0b063
```
Changed refund log level to warning.
```
  Waheed Ahmed committed Jun 16, 2016
  70a0b063 Browse Files
- Changed refund log level to warning. · 07ab6cc7
```
ECOM-2378
```
  Waheed Ahmed committed Jun 16, 2016
  07ab6cc7 Browse Files
- Merge pull request #12744 from edx/clrux/ac-455 · b725dc0d
```
AC-455 adding main to PDF books; styling chapters
```
  Chris committed Jun 15, 2016
  b725dc0d Browse Files