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

29125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Sanchez
081f5b4e53 Add E-Commerce settings to AWS settings. 2015-03-16 19:31:15 +00:00
Will Daly
2cbe6fdecb Merge pull request #7371 from edx/will/django-rest-framework-cors-csrf 
Skip CSRF referer check for cross-domain requests.
 2015-03-16 12:30:30 -04:00
Will Daly
b625e8e37e Skip CSRF referer check for cross-domain requests. 
This commit extends the workaround in `cors_csrf` middleware
to Django Rest Framework's SessionAuthentication, which
calls Django's CSRF middleware directly.

The workaround checks the cross domain whitelist and
skips the CSRF referer check for domains on the whitelist.
 2015-03-16 11:48:09 -04:00
Brian Wilson
8324fd0209 Merge remote-tracking branch 'origin/release' into rc/2015-03-17 2015-03-16 11:43:26 -04:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain 
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
 2015-03-16 10:44:00 -04:00
Sarina Canelake
0a385c04f1 Merge pull request #7366 from edx/sarina/20150316-update-translations 
Update translations (autogenerated message)
 2015-03-16 10:35:34 -04:00
Sarina Canelake
3569e7fef5 Update translations (autogenerated message) 2015-03-16 10:32:27 -04:00
Jesse Zoldak
90211a137a Merge pull request #7367 from edx/revert-6167-patch-5 
Revert "To support UNICODE xblock.location"
 2015-03-16 10:27:40 -04:00
Jesse Zoldak
26afdf768c Revert "To support UNICODE xblock.location" 2015-03-16 10:15:41 -04:00
Waqas Khalid
1b44f1e237 Merge pull request #7044 from edx/waqas/make-lms-mathjax-independent 
Lms should be independent of mathjax
 2015-03-16 18:47:32 +05:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem 
Unit page doesn't load when mathjax is down
 2015-03-16 18:47:06 +05:00
Calen Pennington
8247ace595 Revert "Merge pull request #7258 from cpennington/lms-field-data-query-counts" 
This reverts commit 4856ef78d3, reversing
changes made to 7abbbb443a.
 2015-03-16 09:41:40 -04:00
Mark Hoeber
5efabb1c4b Merge pull request #7307 from edx/markhoeber-enrollment-api-doc-fix 
Add Mocks to Enrollment API Doc Config
 2015-03-16 09:28:29 -04:00
Sarina Canelake
dadc47c22a Merge pull request #6167 from fmyzjs/patch-5 
To support UNICODE xblock.location
 2015-03-16 09:05:10 -04:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down 
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
 2015-03-16 15:12:01 +05:00
Waqas Khalid
4a086f54d5 Lms should be independent of mathjax 
When cdn is down specially in the country like china
and others user face problem as application doesn't
work as intended. Instead of making mathjax hard
dependecy I have converted it into soft dependey
so that it won't cause user problem to use application
smothly if mathjax is not present.

TNL-1498
 2015-03-16 15:10:25 +05:00
Sarina Canelake
fd0e389c3f Merge pull request #7063 from stvstnfrd/pylint/medium 
Fix Pylint violations (medium)
 2015-03-14 21:51:29 -04:00
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
Calen Pennington
4856ef78d3 Merge pull request #7258 from cpennington/lms-field-data-query-counts 
Reduce query counts in FieldDataCache/DjangoKeyValueStore
 2015-03-13 15:55:57 -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