Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,080 Commits 1 Branch 0 Tags
659e90ea95bd1bb8dd237fef37daa7eb6d6bb99a
Commit Graph

29080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
659e90ea95 pass opts From PythonTestSuite to NoseTestSuite 2015-03-16 11:13:31 -04:00
Christine Lytwynec
8ff4886888 Merge pull request #7337 from edx/clytwynec/flaky-tests-test_password_reset_success 
decorate flaky test
 2015-03-13 13:21:55 -04:00
Matt Drayer
cb2c8bc8c7 Merge pull request #7113 from edx/mattdrayer/certs-web-view 
Added Certificates Web/HTML View
 2015-03-13 13:08:52 -04:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -04:00
Jesse Zoldak
766663eefa Merge pull request #7217 from edx/ziafazal/fix-studio-settings-flaky-test 
fixed a flaky test (acceptance.tests.studio.test_studio_settings_details.SettingsMilestonesTest.test_prerequisite_course_save_successfully)
 2015-03-13 11:19:50 -04:00
Christine Lytwynec
fd6d135052 decorate flaky test 2015-03-13 10:53:09 -04:00
Awais Qureshi
4e454ccaed Merge pull request #7267 from edx/awais786/ECOM-911-enable-noid-paid-course 
Awais786/ecom 911 enable noid paid course
 2015-03-13 18:39:05 +05:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
Clinton Blackburn
cff9a5aa78 Merge pull request #7318 from edx/clintonb/register-with-oscar 
Enrolling via E-Commerce API for combined login-registration page
 2015-03-13 01:32:26 -04:00
Clinton Blackburn
935323a879 Enrolling via E-Commerce API for combined login-registration page 
The login-registration page now supports using the E-Commerce API when enrolling users in honor seats (of courses with SKUs).
 2015-03-13 00:25:13 -04:00
Clinton Blackburn
eaa7a22058 Added commerce/purchase endpoint 
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.
 2015-03-13 00:25:13 -04:00
Kelketek
a7e1f9caf3 Merge pull request #7301 from open-craft/course-import-page-fix 
Replace broken logic in import template with working logic in view.
 2015-03-12 18:15:32 -05:00
Matt Drayer
41cab6d49f Merge pull request #7320 from edx/mattdrayer/add-milestones-app-check 
Cleaned up milestones API references
 2015-03-12 17:36:35 -04:00
Mark Sadecki
dd82a40aa9 Merge pull request #7317 from edx/cptvitamin/TNL-1674-fix-invalid-aria-role-dialogalert 
fixes invalid aria-role dialogalert which should be alertdialog
 2015-03-12 16:35:54 -04:00
Adam
6d3631df98 Merge pull request #7330 from edx/release 
Release
 2015-03-12 16:17:26 -04:00
Jonathan Piacenti
8c920b469c Replace broken logic in import template with working logic in view. 2015-03-12 20:13:47 +00:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
Adam
7abbbb443a Merge pull request #7324 from edx/hotfix/2015-03-12 
update schoolyourself xblock (TNL-1395)
 2015-03-12 15:13:41 -04:00
Nimisha Asthagiri
cce00e6933 Merge pull request #7310 from edx/mobile/MA-125 
MA-125 Mobile Enrollment API: add certificate info.
 2015-03-12 15:01:39 -04:00
Nimisha Asthagiri
9f0d6c006d MA-125 Mobile Enrollment API: add certificate info 2015-03-12 14:11:14 -04:00
alawibaba
3c4252e79c Merge branch 'release' 2015-03-12 13:21:53 -04:00
alawibaba
5107d463c7 Merge branch 'master' into release 
Conflicts:
	lms/envs/common.py (RESOLVED)
 2015-03-12 13:20:45 -04:00
Nimisha Asthagiri
d7fd454bce Merge pull request #7316 from edx/video-pipeline/setting-display-fix 
Do not show video_upload_pipeline setting if the feature is disabled
 2015-03-12 11:25:27 -04:00
Mark Sadecki
c2ec7cc6e7 fixes invalid aria-role dialogalert which should be alertdialog 2015-03-12 11:00:35 -04:00
Adam Palay
bb2f7dedfd update schoolyourself xblock (TNL-1395) 2015-03-12 10:50:32 -04:00
Ali Mohammad
fd312ab13b Merge pull request #7302 from edx/alawibaba/hotfix-cdn-experiment 
hotfix: China CDN cleanup and bugfixes
 2015-03-12 10:46:59 -04:00
Shrhawk
4289ecd341 Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped 
Add metatag <path_prefix> for pdf_viewer.html
 2015-03-12 19:17:01 +05:00
David Baumgold
78d8b00ab7 Merge pull request #7286 from edx/avoid-needless-mako 
For video module, don't use Mako unnecessarily
 2015-03-12 09:22:56 -04:00
Aamir
48446b7612 Merge pull request #7285 from edx/aamir/ECOM-1177-price-display-bug 
ECOM-1177: Removed the session variable on pay_and_verify view
 2015-03-12 17:57:58 +05:00
Awais Qureshi
2e84c49660 Merge pull request #7248 from edx/awais786/ECOM-1155-datetime-issue 
ECOM-1155 fix the date diff issue.
 2015-03-12 17:53:20 +05:00
Syed Hassan Raza
64515f1d62 Add metatag <path_prefix> for pdf_viewer.html 2015-03-12 17:19:38 +05:00
aamir-khan
1512c0609e ECOM-1177: Removed the session variable on pay_and_verify view 2015-03-12 16:40:02 +05:00
Awais
281c8dce2b ECOM-1155 fix the date diff issue. 2015-03-12 16:24:51 +05:00
Nimisha Asthagiri
8e5563d467 Do not show video_upload_pipeline advanced setting if the feature is disabled. 2015-03-11 17:58:32 -04:00
David Baumgold
9c59ebd688 For video module, don't use Mako unnecessarily 2015-03-11 15:37:21 -04:00
Ben Patterson
f473c474bd Merge pull request #7287 from edx/benp/more-scripts-hints 
Adding hints for otherwise quiet quality shard steps.
 2015-03-11 15:29:06 -04:00
alawibaba
cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. 2015-03-11 14:28:20 -04:00
Adam Palay
882eab4bc9 cache site status message for 5 minutes (TNL-1614) 2015-03-11 14:28:19 -04:00
Will Daly
a5a303ae57 Cross-domain CSRF cookies 
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
 2015-03-11 14:28:19 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Sarina Canelake
9d9dccdb97 Merge pull request #7299 from edx/sarina/indagation/TNL-1461 
Add pointer-events: none for fa-lock and fa-eye
 2015-03-11 11:04:26 -04:00
Kelketek
b4c6211e4a Merge pull request #7235 from open-craft/enable-content-libraries 
Enable content libraries by default
 2015-03-11 09:42:47 -05:00
Kelketek
91642dce33 Merge pull request #7245 from open-craft/studio-home-test 
Exfoliate flaky studio home test. (SOL-430)
 2015-03-11 09:33:21 -05:00
Kelketek
1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export 
Content Libraries Import/Export
 2015-03-11 09:27:45 -05:00
Sarina Canelake
932bb1951d Add Kyle Boots to AUTHORS 2015-03-11 10:20:42 -04:00
Sarina Canelake
d1543b6156 Add pointer-events: none for fa-lock and fa-eye [TNL-1461] 2015-03-11 10:20:26 -04:00
Mark Hoeber
86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates 
Studio template updates
 2015-03-11 09:16:40 -04:00
Matjaz Gregoric
bc92c504b4 Add myself to AUTHORS. 2015-03-11 18:53:42 +08:00
Mark Hoeber
12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates 2015-03-10 20:58:01 -04:00
Martyn James
b4ba5cbae9 Merge pull request #7242 from edx/mjames/SOL-290 
Addresses SOL-290.
 2015-03-10 17:45:38 -04:00