Commit Graph

29102 Commits

Author SHA1 Message Date
stv
4e2927f146 Lower Pylint threshold to 5800 violations 2015-03-14 13:35:21 -07:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
f03b943b95 Fix Pylint: W0612(unused-variable) 2015-03-13 20:20:05 -07:00
stv
79f9d1a70f Fix Pylint: E1121(too-many-function-args) 2015-03-13 20:20:04 -07:00
stv
e7e9a16379 Fix Pylint: W0403(relative-import) 2015-03-13 20:20:04 -07:00
stv
268cb46d97 Fix Pylint: E0211(no-method-argument)
I can find no other record of this class.
2015-03-13 20:20:04 -07:00
stv
b9ed4b6561 Fix Pylint: E1305(too-many-format-args) 2015-03-13 20:20:04 -07:00
stv
83fec5d092 Fix Pylint: W0109(duplicate-key) 2015-03-13 20:20:04 -07:00
stv
0248660214 Fix Pylint: W0631(undefined-loop-variable) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
stv
90b3318d01 Fix Pylint: I0010(bad-inline-option) 2015-03-13 20:20:03 -07:00
Andy Armstrong
63341287ca Merge pull request #7343 from edx/andya/openedx-dir-coverage
Add coverage to openedx directory
2015-03-13 16:09:17 -04:00
Christina Roberts
96528be65b Merge pull request #7348 from edx/christina/account-empty-email
Don't allow empty string or None for email.
2015-03-13 15:50:53 -04:00
Clinton Blackburn
5b2dd87a07 Merge pull request #7333 from edx/clintonb/commerce-json-fix
Corrected data sent to E-Commerce API
2015-03-13 15:42:28 -04:00
Jesse Zoldak
63bf151074 Merge pull request #7339 from edx/zoldak/TNL-1679
Disable flaky lettuce test TNL-1679
2015-03-13 15:22:49 -04:00
Sarina Canelake
257462aa9c Merge pull request #7344 from edx/sarina/fix-sarina
Remove old comment from file
2015-03-13 15:19:51 -04:00
cahrens
207e500a23 Don't allow empty string or None for email. 2015-03-13 14:59:02 -04:00
Nimisha Asthagiri
28ad138829 Merge pull request #7311 from edx/mobile/MA-345-FB-URL
MA-345 Mobile Enrollment API: add course' Facebook URL.
2015-03-13 13:56:42 -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
Sarina Canelake
fe4c053c25 Remove old comment from file 2015-03-13 12:47:20 -04:00
Andy Armstrong
a75186dafe Add coverage to openedx directory 2015-03-13 12:41:54 -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
Nimisha Asthagiri
e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL 2015-03-13 11:13:33 -04:00
Jesse Zoldak
7565825714 Disable flaky lettuce test TNL-1679 2015-03-13 11:04:12 -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
acb141a990 Corrected data sent to E-Commerce API
Data is now properly encoded as JSON.
2015-03-13 02:36:22 -04: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