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

29091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
a0caf13da9 certificates: prepping sass + vendor code to compile LTR/RTL options 2015-03-17 16:40:52 -04:00
Brian Talbot
12d1992e66 certificates: revising breakpoint names/definitions to match current FED standards 2015-03-17 16:40:51 -04:00
Brian Talbot
8f9b3dad98 certificates: referencing platform-centric copies of imported typefaces 2015-03-17 16:40:51 -04:00
Brian Talbot
1ef0751f7a certificates: re-organizing comments/folder structure to match current FED standards 2015-03-17 16:40:50 -04:00
Brian Talbot
3590985f47 certificates: manually configuring responsive grid details 2015-03-17 16:40:50 -04:00
Brian Talbot
e11c853672 certificates: updating app copies of Bourbon and Neat Sass utilities 2015-03-17 16:40:49 -04:00
Brian Talbot
31a5fb31fc certificates: removing edX-centric Sass variables from config 2015-03-17 16:40:49 -04:00
Brian Talbot
85f1d09d6b certificates: removing edX-centric supplemental content from views 2015-03-17 16:40:49 -04:00
Brian Talbot
597af988ae certificates: abstracting out all certificate sass vs. individual views 2015-03-17 16:40:49 -04:00
Brian Talbot
71c9a2d490 certificates: moving Sass/UI naming conventions to documented standards 2015-03-17 16:40:48 -04:00
Brian Talbot
d7a5d24c1a certificates: moving HTML to documented standards 2015-03-17 16:40:48 -04:00
Brian Talbot
f8b835f232 certificates: pruning default asset references 2015-03-17 16:40:48 -04:00
Brian Talbot
5c0d771817 certificates: removing edX-specific content/UI 2015-03-17 16:40:47 -04:00
Brian Talbot
50856a0ada certificates: updating and abstracting HTML templates 2015-03-17 16:40:47 -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
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