Commits · 6d8f2a4ae0e008ed885efded681e5dd56e869719 · edx / edx-platform · GitLab

19 Nov, 2014 3 commits
- More tweaks to calculator tooltip · 6d8f2a4a
  Sylvia Pearce committed Nov 19, 2014
  
  6d8f2a4a Browse Files
- Tweaks to calculator tooltip · 14e022ca
  Sylvia Pearce committed Nov 19, 2014
  
  14e022ca Browse Files
- Second try at a new calculator tooltip · 1b285be2
  Sylvia Pearce committed Nov 19, 2014
  
  1b285be2 Browse Files
18 Nov, 2014 7 commits
- Update calculator tooltip · d7d86cdd
  Sylvia Pearce committed Nov 18, 2014
  
  d7d86cdd Browse Files
- Merge pull request #5981 from edx/mobile/MA-141 · ec552cf1
```
MA-141 Support webm encoding for VAL-enabled videos
```
  Nimisha Asthagiri committed Nov 18, 2014
  ec552cf1 Browse Files
- Merge pull request #5920 from edx/aleffert/additional-beta-checks · 08cd3272
```
Add a check for beta users in the video_info API
```
  Akiva Leffert committed Nov 18, 2014
  08cd3272 Browse Files
- Merge pull request #5945 from edx/waheed/tnl395-updated-open-sans-webfonts · 7232c084
```
Updated open sans webfonts with latest.
```
  Waheed Ahmed committed Nov 18, 2014
  7232c084 Browse Files
- Updated open sans webfonts with latest. · 2d46a793
```
TNL-395
```
  Waheed Ahmed committed Nov 18, 2014
  2d46a793 Browse Files
- MA-141 Support webm encoding for VAL-enabled videos · caf5d539
  Nimisha Asthagiri committed Nov 17, 2014
  
  caf5d539 Browse Files
- Add a check for beta users in the video_info API · 546256d7
```
Discovered a case I missed on the original version of this. See
https://github.com/edx/edx-platform/pull/5798
JIRA: MA-76

Also fixes checking for mobile_access when course is None
JIRA: MOB-978
```
  Akiva Leffert committed Nov 17, 2014
  546256d7 Browse Files
17 Nov, 2014 23 commits
- Merge pull request #5965 from edx/sanchez/change-order-event · 673d4fbc
```
Updating default values and changing event data.
```
  Stephen Sanchez committed Nov 17, 2014
  673d4fbc Browse Files
- Merge pull request #5978 from edx/release · 8e91def1
```
Release
```
  Renzo Lucioni committed Nov 17, 2014
  8e91def1 Browse Files
- Merge pull request #5948 from edx/will/combine-reg-login-form · 4a814c24
```
Combined Login/Registration Form
```
  Will Daly committed Nov 17, 2014
  4a814c24 Browse Files
- Updating default values and changing event data. · 0c3df636
  stephensanchez committed Nov 17, 2014
  
  0c3df636 Browse Files
- Merge pull request #5976 from edx/hotfix-2014-11-17 · 52b6ef89
```
disable "go to payment button" on click (ECOM-643)
```
  Renzo Lucioni committed Nov 17, 2014
  52b6ef89 Browse Files
- Merge pull request #5916 from edx/will/ecom-543 · a89b9bac
```
Send transaction type for donations and verified certificates
```
  Will Daly committed Nov 17, 2014
  a89b9bac Browse Files
- Merge pull request #5975 from edx/sanchez/change_api_student_id · ffa08453
```
Update the API and Data Layer to get the student from the models.
```
  Stephen Sanchez committed Nov 17, 2014
  ffa08453 Browse Files
- Merge pull request #5951 from edx/cdodge/treat-empty-email-template-names-as-NULL · 37e38026
```
Treat an empty string from the admin form to be None/NULL for the Course...
```
  chrisndodge committed Nov 17, 2014
  37e38026 Browse Files
- Don't use 'test' db for mysql since it's reserved. · 4db5b311
```
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.

Conflicts:
	scripts/reset-test-db.sh
```
  Ben Patterson committed Nov 17, 2014
  4db5b311 Browse Files
- Merge pull request #5974 from edx/mobile/MA-135-122 · 6f1243e8
```
MA-135, MA-122 Support CDN, alternative sources with VAL-enabled-videos
```
  Nimisha Asthagiri committed Nov 17, 2014
  6f1243e8 Browse Files
- Merge pull request #5972 from edx/will/remove-page-view-events · fe735e29
```
Remove redundant pageview segment.io events (ECOM-619)
```
  Will Daly committed Nov 17, 2014
  fe735e29 Browse Files
- disable "go to payment button" on click (ECOM-643) · e7b23faa
  Adam Palay committed Nov 17, 2014
  
  e7b23faa Browse Files
- Update the API and Data Layer to get the student from the models. · 75e45bc2
  stephensanchez committed Nov 17, 2014
  
  75e45bc2 Browse Files
- Treat an empty string from the admin form to be None/NULL for the CourseEmailTemplateForm · adbe133f
  Chris Dodge committed Nov 17, 2014
  
  adbe133f Browse Files
- MA-135, MA-122 Support CDN and alternative sources with VAL-enabled-videos. · 12a22ac8
  Nimisha Asthagiri committed Nov 17, 2014
  
  12a22ac8 Browse Files
- Merge pull request #5973 from edx/alasdair/logistration-password-scroll · c7f54311
```
ECOM-650 updated to add auto scrolling for password reset view
```
  AlasdairSwan committed Nov 17, 2014
  c7f54311 Browse Files
- Merge pull request #5964 from edx/renzo/password-reset-selenium · 5d156917
```
Renzo/password reset selenium
```
  Renzo Lucioni committed Nov 17, 2014
  5d156917 Browse Files
- ECOM-650 updated to add auto scrolling for password reset view · dff0acf5
  AlasdairSwan committed Nov 17, 2014
  
  dff0acf5 Browse Files
- Remove redundant pageview segment.io events · 1ebb8ef0
  Will Daly committed Nov 17, 2014
  
  1ebb8ef0 Browse Files
- Merge pull request #5971 from edx/alasdair/logistration-css-bugs · 87af92a1
```
ECOM-651 No longer updating -settings by default
```
  AlasdairSwan committed Nov 17, 2014
  87af92a1 Browse Files
- ECOM-651 No longer updating -settings by default · 69446678
  AlasdairSwan committed Nov 17, 2014
  
  69446678 Browse Files
- Respond to code review feedback · 92d10ebd
  Will Daly committed Nov 17, 2014
  
  92d10ebd Browse Files
- Send transaction type for donations and verified certificates to CyberSource · 12fec6c9
  Will Daly committed Nov 17, 2014
  
  12fec6c9 Browse Files
15 Nov, 2014 2 commits
- Selenium tests of logistration password reset · 96dcdb43
  Renzo Lucioni committed Nov 14, 2014
  
  96dcdb43 Browse Files
- Merge pull request #5956 from edx/mobile/analytics-shim-update · ec74398d
```
MA-90 Update Analytics Shim to match new mobile requirements.
```
  Nimisha Asthagiri committed Nov 14, 2014
  ec74398d Browse Files
14 Nov, 2014 5 commits
- Merge pull request #5962 from edx/sanchez/disable-login-button-on-click · 83f8de6c
```
Adding disable logic for buttons.
```
  Stephen Sanchez committed Nov 14, 2014
  83f8de6c Browse Files
- Merge pull request #5959 from edx/will/logistration-selenium · c9e11258
```
Logistration: Bok-choy tests for the combined login/registration page.
```
  Will Daly committed Nov 14, 2014
  c9e11258 Browse Files
- Add Selenium tests for the combined login/registration form. · ffee7517
  Will Daly committed Nov 14, 2014
  
  ffee7517 Browse Files
- Merge pull request #5960 from edx/jeskew/default_asset_collection_name · 126747fe
```
Always create an asset metadata collection in the Mongo modulestore.
```
  John Eskew committed Nov 14, 2014
  126747fe Browse Files
- Adding disable logic for buttons. · 24869016
```
Update tests, clean up approach.

Updating jasmine tests.
```
  stephensanchez committed Nov 14, 2014
  24869016 Browse Files