Commits · caedc92d6797b6dc3a40f4cba0c872a037fdd7d7 · edx / edx-platform

22 Jun, 2016 18 commits
- Merge pull request #12796 from eduNEXT/fmo/coffee_to_js_module_edit · caedc92d
```
Converting cms module_edit.coffee to js
```
  Andy Armstrong committed Jun 22, 2016
  caedc92d Browse Files
- Converting the module_edit coffee file to a js file · 82db66d9
```
Converting to js and fixing references

Linting the generated code
```
  Felipe Montoya committed Jun 22, 2016
  82db66d9 Browse Files
- Merge pull request #12827 from edx/release · 2c41d79c
```
Release -> Master after revert 
```
  Kevin Falcone committed Jun 22, 2016
  2c41d79c Browse Files
- Corrected name of static file (#12817) · d7c570aa
```
ECOM-4610
```
  Clinton Blackburn committed Jun 22, 2016
  d7c570aa Browse Files
- Merge pull request #12826 from edx/jibsheet/revert-pr-12573 · a5a235bd
```
Revert "[PERF-325] Add versioned course asset URLs when canonicalizin…
```
  Kevin Falcone committed Jun 22, 2016
  a5a235bd Browse Files
- Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." · 9967b6fd
```
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f.
```
  Kevin Falcone committed Jun 22, 2016
  9967b6fd Browse Files
- Merge pull request #12756 from edx/ssemenova/flakeytest · 1d09f787
```
Fix flakey TextbooksTest
```
  Sofiya Semenova committed Jun 22, 2016
  1d09f787 Browse Files
- Merge pull request #12824 from edx/release · 0a7c534d
```
Release
```
  mdinino committed Jun 22, 2016
  0a7c534d Browse Files
- fixed flakiness · 9545c90a
```
TNL-4806
```
  ssemenova committed Jun 22, 2016
  9545c90a Browse Files
- Merge pull request #12803 from edx/ssemenova/disabledstates · 08aeb27d
```
Got rid of aria-disabled states 
```
  Sofiya Semenova committed Jun 22, 2016
  08aeb27d Browse Files
- Merge pull request #12788 from edx/ned/update-transifex-client · 0d8cf05d
```
Use the latest version of the transifex client
```
  Ned Batchelder committed Jun 22, 2016
  0d8cf05d Browse Files
- Merge pull request #12811 from edx/mjfrey/micro-settings-merge · 48b80b51
```
mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys
```
  Michael Frey committed Jun 22, 2016
  48b80b51 Browse Files
- Merge pull request #12801 from edx/muddasser/bok-choy-to-lettuce/component · d336e246
```
Conversion of cms/component.feature into bokchoy tests
```
  Muddasser committed Jun 22, 2016
  d336e246 Browse Files
- Conversion of cms/component.feature into bokchoy tests · ce665e3b
  Muddasser committed Jun 22, 2016
  
  ce665e3b Browse Files
- Merge pull request #12790 from edx/shr/bug/ECOM-4645-Certificate-exception-whitelisted-users · 01c8b349
```
exception_handling_for_unverified_cert_status
```
  Syed Hasan raza committed Jun 22, 2016
  01c8b349 Browse Files
- exception_handling_for_unverified_cert_status · 5f7cdcd3
  Syed Hassan Raza committed Jun 22, 2016
  
  5f7cdcd3 Browse Files
- mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys · 6efc461f
```
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
```
  Michael Frey committed Jun 21, 2016
  6efc461f Browse Files
- Merge pull request #12808 from edx/rc/2016-06-21 · 8f69f62c
```
Rc/2016 06 21
```
  mdinino committed Jun 21, 2016
  8f69f62c Browse Files
21 Jun, 2016 15 commits
- Merge pull request #12768 from… · a240780b
```
Merge pull request #12768 from edx/alasdair/ECOM-4224-certificate-messaging-for-program-course-cards

Front End for certificates
```
  Renzo Lucioni committed Jun 21, 2016
  a240780b Browse Files
- Merge pull request #12815 from edx/douglashall/SOL-1844 · f8ac8c1a
```
SOL-1844 Upgrade edx-proctoring to 0.12.20
```
  Douglas Hall committed Jun 21, 2016
  f8ac8c1a Browse Files
- edx-submissions version bump (#12812) · 49add6c9
  Eric Fischer committed Jun 21, 2016
  
  49add6c9 Browse Files
- Exposed admin for LogoutViewConfiguration · 03095643
```
ECOM-4610
```
  Clinton Blackburn committed Jun 21, 2016
  03095643 Browse Files
- fixed aria-disabled states · ea810902
```
TNL-4805
```
  ssemenova committed Jun 21, 2016
  ea810902 Browse Files
- Program details front end for certificates · 619829d5
```
Part of ECOM-4224.
```
  AlasdairSwan committed Jun 21, 2016
  619829d5 Browse Files
- Merge pull request #12767 from edx/diana/topic-truncation · 7c647e5e
```
Change topic name truncation.
```
  Diana Huang committed Jun 21, 2016
  7c647e5e Browse Files
- Merge pull request #12208 from edx/andya/use-ui-toolkit-helpers · 037e27b2
```
Use the UI Toolkit's spec helpers
```
  Andy Armstrong committed Jun 21, 2016
  037e27b2 Browse Files
- Upgrade edx-proctoring to 0.12.20 · 697821e5
  Douglas Hall committed Jun 21, 2016
  
  697821e5 Browse Files
- Use the UI Toolkit's spec helpers. · d462c73f
  Andy Armstrong committed Jun 21, 2016
  
  d462c73f Browse Files
- Change topic name truncation. · d75e6335
  Diana Huang committed Jun 21, 2016
  
  d75e6335 Browse Files
- Merge pull request #12757 from edx/renzo/link-to-detail · 10ad29f3
```
Link program listing cards to detail pages
```
  Renzo Lucioni committed Jun 21, 2016
  10ad29f3 Browse Files
- Merge pull request #12773 from edx/tasawer/story/ecom-4199/inconsistancy-of-invalidate-certs · 38a25446
```
Mark the invalidation entry as inactive If support user re-generates the cert.
```
  Awais Qureshi committed Jun 21, 2016
  38a25446 Browse Files
- Merge pull request #12799 from edx/ibrahimahmed443/override-language-selector · 132d576e
```
allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION
```
  Douglas Hall committed Jun 21, 2016
  132d576e Browse Files
- If support user re-generates the cert. Removes the invalidation entry if exists. · 7ae64b4f
```
ECOM-4199
```
  Awais committed Jun 21, 2016
  7ae64b4f Browse Files
20 Jun, 2016 7 commits
- Merge pull request #12809 from edx/bjacobel/dsc-image-overflow · 949ddb11
```
Add a third fixed case where images could overflow (refs #12735)
```
  Brian Jacobel committed Jun 20, 2016
  949ddb11 Browse Files
- Link program listing cards to detail pages · 9cd7c932
```
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
```
  Renzo Lucioni committed Jun 20, 2016
  9cd7c932 Browse Files
- Add a third fixed case where images could overflow (refs #12735) · 6aba6219
  Brian Jacobel committed Jun 20, 2016
  
  6aba6219 Browse Files
- Merge pull request #12810 from edx/andya/no-karma-firefox-modals · cae69f96
```
Don't auto-update during Karma test runs
```
  Andy Armstrong committed Jun 20, 2016
  cae69f96 Browse Files
- Don't auto-update during Karma test runs · f7133089
  Andy Armstrong committed Jun 20, 2016
  
  f7133089 Browse Files
- Merge pull request #12804 from edx/kylecrawshaw/unusable-password-option · 5e4ce786
```
Added 'unusable_password' argument to 'manage_user' management command
```
  kylecrawshaw committed Jun 20, 2016
  5e4ce786 Browse Files
- Added 'unusable_password' argument to 'manage_user' management command · 47401742
  Kyle Crawshaw committed Jun 20, 2016
  
  47401742 Browse Files