Commits · 6e34687ff8a2de48c1ed6b715decfc00d754376e · edx / edx-platform

15 Apr, 2015 4 commits
- Merge pull request #7704 from edx/zoldak/TE-745 · 6e34687f
```
Increase timeout for library page to load after refresh in acceptance tests
```
  Jesse Zoldak committed Apr 15, 2015
  6e34687f Browse Files
- Increase timeout for library page to load after refresh in acceptance tests. TE-745 · 708203b3
  Jesse Zoldak committed Apr 15, 2015
  
  708203b3 Browse Files
- Merge pull request #7690 from edx/awais786/ECOM-1420-new-field · 04ca163f
```
ECOM-1420 adding new field and migration file.
```
  Awais Qureshi committed Apr 15, 2015
  04ca163f Browse Files
- ECOM-1420 adding new field and migration file. · 18282919
  Awais committed Apr 15, 2015
  
  18282919 Browse Files
14 Apr, 2015 8 commits
- Merge pull request #7663 from applecool/edxsprint · 07b7c5c8
```
Fix for TNL-1639
```
  Sarina Canelake committed Apr 14, 2015
  07b7c5c8 Browse Files
- Merge pull request #7666 from edx/gprice/fix-oauth-exchange · ce8a6e5b
```
Enable OAuth token exchange only if OAuth provider
```
  Greg Price committed Apr 14, 2015
  ce8a6e5b Browse Files
- Merge pull request #7669 from edx/will/fix-release-script-escaping · 860cc8f2
```
Escape curly quotes in release page table
```
  Will Daly committed Apr 14, 2015
  860cc8f2 Browse Files
- Merge pull request #7683 from edx/release · d3bb7225
```
Release
```
  Adam committed Apr 14, 2015
  d3bb7225 Browse Files
- Merge pull request #7548 from edx/mjevtic/SOL-531 · a3aecb20
```
(SOL-531)(SOL-532) Course Cards update on the homepage; 
```
  Marko Jevtić committed Apr 14, 2015
  a3aecb20 Browse Files
- Merge pull request #7679 from edx/zub/bugfix/ecom-1355-ie9-verification-webcam-without-flash · b6fd3031
```
show error message to user on photo reverification page if Flash not fou...
```
  zubair-arbi committed Apr 14, 2015
  b6fd3031 Browse Files
- (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been… · 939a3672
```
(SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage
```
  marjev committed Apr 14, 2015
  939a3672 Browse Files
- show error message to user on photo reverification page if Flash not found · e04e61d6
```
ECOM-1355
```
  zubair-arbi committed Apr 14, 2015
  e04e61d6 Browse Files
13 Apr, 2015 22 commits
- Merge pull request #7674 from applecool/authors · b3ab7fce
```
Added name to the authors list
```
  Sarina Canelake committed Apr 13, 2015
  b3ab7fce Browse Files
- Added name to the authors list · 74415858
  applecool committed Apr 13, 2015
  
  74415858 Browse Files
- Merge pull request #7635 from edx/clee/MA-318 · 9bf8ae5b
```
MA-318, change edx video id to video id
```
  Christopher Lee committed Apr 13, 2015
  9bf8ae5b Browse Files
- Merge pull request #7577 from edx/mattdrayer/SOL-464 · 97f0cf10
```
Add course-specific URL overrides for social sharing icons on student da...
```
  Matt Drayer committed Apr 13, 2015
  97f0cf10 Browse Files
- Escape curly quotes in release page table · c81bac95
  Will Daly committed Apr 13, 2015
  
  c81bac95 Browse Files
- MA-318, change edx video id to video id · c42097b4
  christopher lee committed Apr 13, 2015
  
  c42097b4 Browse Files
- Add course-specific URL overrides for social sharing icons on student dashboard · ffe30da7
```
- sharing enabled for custom URLs only if URL actually specified
```
  Matt Drayer committed Apr 13, 2015
  ffe30da7 Browse Files
- Enable OAuth token exchange only if OAuth provider · 903422b8
  Greg Price committed Apr 13, 2015
  
  903422b8 Browse Files
- Merge pull request #7655 from edx/dcikatic/SOL-570 · e1be8a52
```
SOL-570 Remove djangotracker from common imports - merging
```
  Martyn James committed Apr 13, 2015
  e1be8a52 Browse Files
- Merge pull request #7662 from edx/hotfix/2015-04-13 · 52488cae
```
Revert hotfix for PLAT-452
```
  Waqas Khalid committed Apr 13, 2015
  52488cae Browse Files
- Merge pull request #7650 from edx/multibeacon · 6b11ff6f
```
Added more precise alerting to video beacon experiment.
```
  Ali Mohammad committed Apr 13, 2015
  6b11ff6f Browse Files
- SOL-570 Remove djangotracker from common imports · 0fa86e3d
  Dino Cikatic committed Apr 13, 2015
  
  0fa86e3d Browse Files
- Merge pull request #7560 from mcgachey/mcgachey-oauthlib-version · b1e8fcf6
```
[Dependencies] Upgrading oauthlib from 0.6.3 to 0.7.2
```
  David Ormsbee committed Apr 13, 2015
  b1e8fcf6 Browse Files
- Fix for TNL-1639 · c4cdfe21
  applecool committed Apr 13, 2015
  
  c4cdfe21 Browse Files
- Merge pull request #7656 from louyihua/cms_i18n_1 · 2c7dd724
```
i18n fix in studio
```
  Sarina Canelake committed Apr 13, 2015
  2c7dd724 Browse Files
- Revert hotfix for PLAT-452 · 08c67527
  Syed Hassan Raza committed Apr 13, 2015
  
  08c67527 Browse Files
- Merge pull request #7637 from louyihua/misc_i18n_1 · 13fe58e1
```
Better i18n for LMS
```
  Sarina Canelake committed Apr 13, 2015
  13fe58e1 Browse Files
- Merge pull request #7659 from edx/cdodge/fix-translation-help · f38b90fd
```
fix I18N errors in business order confirmation email
```
  chrisndodge committed Apr 13, 2015
  f38b90fd Browse Files
- fix I18N errors in business order confirmation email · 768dd922
  Chris Dodge committed Apr 13, 2015
  
  768dd922 Browse Files
- Merge pull request #7627 from edx/awais786/ECOM-1183-verification-expiry · b8368617
```
ECOM-1183 fixing the
```
  Awais Qureshi committed Apr 13, 2015
  b8368617 Browse Files
- i18n fix in studio · 7a45d6e4
```
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
```
  louyihua committed Apr 13, 2015
  7a45d6e4 Browse Files
- Better i18n · 9a0da7d6
```
Combine sentences in several pages for better translation.
```
  louyihua committed Apr 13, 2015
  9a0da7d6 Browse Files
12 Apr, 2015 1 commit
- Merge pull request #7657 from edx/sarina/fix-typo · b6265c44
```
Fix typo: Certfificate -> Certificate
```
  Sarina Canelake committed Apr 11, 2015
  b6265c44 Browse Files
11 Apr, 2015 5 commits
- Fix typo: Certfificate -> Certificate · 293f2568
  Sarina Canelake committed Apr 11, 2015
  
  293f2568 Browse Files
- Change byte-sized bugs link · d3122b01
  Sarina Canelake committed Apr 11, 2015
  
  d3122b01 Browse Files
- Merge pull request #6636 from jazkarta/feature-pocs · 03c3bbb3
```
MIT CCx (was Personal Online Courses)
```
  David Ormsbee committed Apr 11, 2015
  03c3bbb3 Browse Files
- MIT: CCX. Code Quality Fixes · f9351ef8
```
Remove duplicated course listings template code on the student dashboard.
```
  Carlos de la Guardia committed Apr 10, 2015
  f9351ef8 Browse Files
- MIT: CCX. Fixes for API changes that affect the binding of descriptors to student context. · 8ba74429
```
fix for making sure all descriptor fields are always available for course descriptors despite module_class tricks

add required fields to cache data for tests

use a different strategy to mock up the get_children method
```
  cewing committed Apr 10, 2015
  8ba74429 Browse Files