Commits · deefce01948ea58ed1fb7ec3653957fd7f4571d4 · edx / edx-platform

15 Apr, 2015 12 commits
- Merge pull request #7700 from mitocw/feature/cg/ccx_urls · deefce01
```
Put CCX URLs behind their feature flag
```
  Carson Gee committed Apr 15, 2015
  deefce01 Browse Files
- Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop · 1c910023
```
hard start/stop times to video player
```
  David Baumgold committed Apr 15, 2015
  1c910023 Browse Files
- Put CCX URLs behind their feature flag · b6970d9a
```
- Moved the CCX URLS into their django app.
```
  Carson Gee committed Apr 15, 2015
  b6970d9a Browse Files
- Merge branch 'release' · a91d90cb
  Will Daly committed Apr 15, 2015
  
  a91d90cb Browse Files
- Merge pull request #7693 from edx/remove-nested-form-elements · 9018088c
```
Remove nested form elements
```
  David Baumgold committed Apr 15, 2015
  9018088c Browse Files
- 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
- Warning that hard start/stop times don't work for mobile · 2c622636
  ataki committed Apr 15, 2015
  
  2c622636 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
- Merge pull request #7692 from edx/ECOM-1418 · ea52f4d8
```
Fixed Embargo Bug in Enrollment API
```
  Clinton Blackburn committed Apr 14, 2015
  ea52f4d8 Browse Files
- Fixed Embargo Bug in Enrollment API · e18d69a9
```
This issue was not found sooner because the test helper used only tested for GeoIP embargoes, and neglected the user profile. An additional test has been added to test for embargoes against the country assigned to the user's profile. Additionally, variable names have been cleaned up--user replaced with username--to avoid confusion in the future.
```
  Clinton Blackburn committed Apr 14, 2015
  e18d69a9 Browse Files
14 Apr, 2015 14 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
- Remove nested form elements · 93e7d795
```
This is invalid HTML
```
  David Baumgold committed Apr 14, 2015
  93e7d795 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
- Add comment, refactor, handle edge cases · 5f5a77ac
  ataki committed Apr 14, 2015
  
  5f5a77ac Browse Files
- Update variable names for video module · 27d3d034
  ataki committed Apr 14, 2015
  
  27d3d034 Browse Files
- hard start/stop times to video player · 5917ed06
```
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
```
  ataki committed Apr 14, 2015
  5917ed06 Browse Files
- Merge pull request #7688 from edx/revert-plat452 · 1884a0b4
```
Revert hotfix for PLAT-452
```
  Will Daly committed Apr 14, 2015
  1884a0b4 Browse Files
- Revert hotfix for PLAT-452 · 6b50ffd0
  Syed Hassan Raza committed Apr 14, 2015
  
  6b50ffd0 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 14 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