Commits · 257462aa9cc5dd65b9902cf8c7360f89857c1018 · edx / edx-platform · GitLab

13 Mar, 2015 14 commits
- Merge pull request #7344 from edx/sarina/fix-sarina · 257462aa
```
Remove old comment from file
```
  Sarina Canelake committed Mar 13, 2015
  257462aa Browse Files
- Merge pull request #7311 from edx/mobile/MA-345-FB-URL · 28ad1388
```
MA-345 Mobile Enrollment API: add course' Facebook URL.
```
  Nimisha Asthagiri committed Mar 13, 2015
  28ad1388 Browse Files
- Merge pull request #7337 from edx/clytwynec/flaky-tests-test_password_reset_success · 8ff48868
```
decorate flaky test
```
  Christine Lytwynec committed Mar 13, 2015
  8ff48868 Browse Files
- Merge pull request #7113 from edx/mattdrayer/certs-web-view · cb2c8bc8
```
Added Certificates Web/HTML View
```
  Matt Drayer committed Mar 13, 2015
  cb2c8bc8 Browse Files
- Remove old comment from file · fe4c053c
  Sarina Canelake committed Mar 13, 2015
  
  fe4c053c Browse Files
- Added Certficates Web/HTML View · 16e63c9e
  Matt Drayer committed Mar 13, 2015
  
  16e63c9e Browse Files
- Merge pull request #7217 from edx/ziafazal/fix-studio-settings-flaky-test · 766663ee
```
fixed a flaky test (acceptance.tests.studio.test_studio_settings_details.SettingsMilestonesTest.test_prerequisite_course_save_successfully)
```
  Jesse Zoldak committed Mar 13, 2015
  766663ee Browse Files
- MA-345 Mobile Enrollment API: add course' Facebook URL · e77bcab5
  Nimisha Asthagiri committed Mar 13, 2015
  
  e77bcab5 Browse Files
- decorate flaky test · fd6d1350
  Christine Lytwynec committed Mar 13, 2015
  
  fd6d1350 Browse Files
- Merge pull request #7267 from edx/awais786/ECOM-911-enable-noid-paid-course · 4e454cca
```
Awais786/ecom 911 enable noid paid course
```
  Awais Qureshi committed Mar 13, 2015
  4e454cca Browse Files
- ECOM-911 no-id-professional mode registration flow · 4bab316b
  Awais committed Mar 13, 2015
  
  4bab316b Browse Files
- Merge pull request #7318 from edx/clintonb/register-with-oscar · cff9a5aa
```
Enrolling via E-Commerce API for combined login-registration page
```
  Clinton Blackburn committed Mar 13, 2015
  cff9a5aa Browse Files
- Enrolling via E-Commerce API for combined login-registration page · 935323a8
```
The login-registration page now supports using the E-Commerce API when enrolling users in honor seats (of courses with SKUs).
```
  Clinton Blackburn committed Mar 13, 2015
  935323a8 Browse Files
- Added commerce/purchase endpoint · eaa7a220
```
This new endpoint is intended to replace enrollment API call used on the login+registration page. Instead of directly enrolling students, the view will contact the external e-commerce API (Oscar) to create a new order. Oscar will be responsible for completing the order and enrolling the student.

This behavior will only apply to course modes with associated SKUs. All other course mode enrollments will be processed directly by LMS.
```
  Clinton Blackburn committed Mar 13, 2015
  eaa7a220 Browse Files
12 Mar, 2015 22 commits
- Merge pull request #7301 from open-craft/course-import-page-fix · a7e1f9ca
```
Replace broken logic in import template with working logic in view.
```
  Kelketek committed Mar 12, 2015
  a7e1f9ca Browse Files
- Merge pull request #7320 from edx/mattdrayer/add-milestones-app-check · 41cab6d4
```
Cleaned up milestones API references
```
  Matt Drayer committed Mar 12, 2015
  41cab6d4 Browse Files
- Merge pull request #7317 from edx/cptvitamin/TNL-1674-fix-invalid-aria-role-dialogalert · dd82a40a
```
fixes invalid aria-role dialogalert which should be alertdialog
```
  Mark Sadecki committed Mar 12, 2015
  dd82a40a Browse Files
- Merge pull request #7330 from edx/release · 6d3631df
```
Release
```
  Adam committed Mar 12, 2015
  6d3631df Browse Files
- Replace broken logic in import template with working logic in view. · 8c920b46
  Jonathan Piacenti committed Mar 12, 2015
  
  8c920b46 Browse Files
- Cleaned up milestones API references · cd053913
  Matt Drayer committed Mar 12, 2015
  
  cd053913 Browse Files
- Merge pull request #7324 from edx/hotfix/2015-03-12 · 7abbbb44
```
update schoolyourself xblock (TNL-1395)
```
  Adam committed Mar 12, 2015
  7abbbb44 Browse Files
- Merge pull request #7310 from edx/mobile/MA-125 · cce00e69
```
MA-125 Mobile Enrollment API: add certificate info.
```
  Nimisha Asthagiri committed Mar 12, 2015
  cce00e69 Browse Files
- MA-125 Mobile Enrollment API: add certificate info · 9f0d6c00
  Nimisha Asthagiri committed Mar 12, 2015
  
  9f0d6c00 Browse Files
- Merge branch 'release' · 3c4252e7
  alawibaba committed Mar 12, 2015
  
  3c4252e7 Browse Files
- Merge branch 'master' into release · 5107d463
```
Conflicts:
	lms/envs/common.py (RESOLVED)
```
  alawibaba committed Mar 12, 2015
  5107d463 Browse Files
- Merge pull request #7316 from edx/video-pipeline/setting-display-fix · d7fd454b
```
Do not show video_upload_pipeline setting if the feature is disabled
```
  Nimisha Asthagiri committed Mar 12, 2015
  d7fd454b Browse Files
- fixes invalid aria-role dialogalert which should be alertdialog · c2ec7cc6
  Mark Sadecki committed Mar 12, 2015
  
  c2ec7cc6 Browse Files
- update schoolyourself xblock (TNL-1395) · bb2f7ded
  Adam Palay committed Mar 12, 2015
  
  bb2f7ded Browse Files
- Merge pull request #7302 from edx/alawibaba/hotfix-cdn-experiment · fd312ab1
```
hotfix: China CDN cleanup and bugfixes
```
  Ali Mohammad committed Mar 12, 2015
  fd312ab1 Browse Files
- Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped · 4289ecd3
```
Add metatag <path_prefix> for pdf_viewer.html
```
  Shrhawk committed Mar 12, 2015
  4289ecd3 Browse Files
- Merge pull request #7286 from edx/avoid-needless-mako · 78d8b00a
```
For video module, don't use Mako unnecessarily
```
  David Baumgold committed Mar 12, 2015
  78d8b00a Browse Files
- Merge pull request #7285 from edx/aamir/ECOM-1177-price-display-bug · 48446b76
```
ECOM-1177: Removed the session variable on pay_and_verify view
```
  Aamir committed Mar 12, 2015
  48446b76 Browse Files
- Merge pull request #7248 from edx/awais786/ECOM-1155-datetime-issue · 2e84c496
```
ECOM-1155 fix the date diff issue.
```
  Awais Qureshi committed Mar 12, 2015
  2e84c496 Browse Files
- Add metatag <path_prefix> for pdf_viewer.html · 64515f1d
  Syed Hassan Raza committed Mar 12, 2015
  
  64515f1d Browse Files
- ECOM-1177: Removed the session variable on pay_and_verify view · 1512c060
  aamir-khan committed Mar 12, 2015
  
  1512c060 Browse Files
- ECOM-1155 fix the date diff issue. · 281c8dce
  Awais committed Mar 12, 2015
  
  281c8dce Browse Files
11 Mar, 2015 4 commits
- Do not show video_upload_pipeline advanced setting if the feature is disabled. · 8e5563d4
  Nimisha Asthagiri committed Mar 11, 2015
  
  8e5563d4 Browse Files
- For video module, don't use Mako unnecessarily · 9c59ebd6
  David Baumgold committed Mar 11, 2015
  
  9c59ebd6 Browse Files
- Merge pull request #7287 from edx/benp/more-scripts-hints · f473c474
```
Adding hints for otherwise quiet quality shard steps.
```
  Ben Patterson committed Mar 11, 2015
  f473c474 Browse Files
- Fixed ID bug in China CDN experiment, added default, changed graphite metric… · cdc81c88
```
Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs.
```
  alawibaba committed Mar 11, 2015
  cdc81c88 Browse Files