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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
1e0f3ddb7d s/pylint: disable=E1111,E1124/pylint: disable=assignment-from-no-return,redundant-keyword-arg/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
19f1dacab2 s/pylint: disable=E1101/pylint: disable=no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
134effa840 Remove outdated pylint disable 2014-12-01 11:22:09 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
20e2ee9a57 s/pylint: disable=E0611/pylint: disable=no-name-in-module/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
John Jarvis
73c9b4c93b pep8 and comments 2014-12-01 10:31:30 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in 
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
 2014-12-01 10:30:16 -05:00
Jesse Zoldak
eacd52568c Merge pull request #6038 from edx/zoldak/not-editable-mode 
Do not install requirements from github.txt in editable mode
 2014-12-01 09:43:24 -05:00
David Baumgold
f79383102a Update pillow to 2.6.1 2014-12-01 09:19:35 -05:00
Chris Dodge
9440235abf actually look for an image to verify that a thumbnail has been generated 2014-12-01 09:18:41 -05:00
David Baumgold
59b423eea2 Decorate test functions that require Pillow JPEG support 2014-12-01 09:18:41 -05:00
David Baumgold
945314bf9c Uncomment thumbnail tests 2014-12-01 09:18:41 -05:00
chrisndodge
716d824479 Merge pull request #6088 from edx/cdodge/no-redirect-to-dashboard 
In microsites, don't redirect logged in users with enrollments to dashbo...
 2014-12-01 09:13:48 -05:00
Chris Dodge
6dea98f8f6 In microsites, don't redirect logged in users with enrollments to dashboard 2014-11-29 19:00:07 -05:00
Chris Dodge
aa9440b139 Merge branch 'master' of github.com:edx/edx-platform 2014-11-29 18:59:53 -05:00
chrisndodge
aac3cc25f7 Merge pull request #6089 from edx/cdodge/pep8-fixes 
fix broken master regarding pep8 number of blank lines
 2014-11-29 18:58:35 -05:00
Chris Dodge
1fdeb82c4d fix broken master regarding pep8 number of blank lines 2014-11-29 11:22:50 -05:00
Chris Dodge
e65bd71a11 fix blank lines 2014-11-29 11:21:45 -05:00
chrisndodge
2fd7a83ebe Merge pull request #6068 from edx/muhhshoaib/WL-163 
The USD symbol $ is hard coded into the HTML templates
 2014-11-28 17:17:14 -05:00
muhammad-ammar
a0dc4c1589 Update AWS Configuration for ORA1 Problem Creation 2014-11-28 11:12:14 +00:00
Sarina Canelake
17aa898a10 Merge pull request #6063 from stvstnfrd/pep8/newline 
Fix recently added PEP8 violations
 2014-11-27 07:56:51 -05:00
Muhammad Shoaib
9fddc6946a WL-163-added-the-USD-symbol-himBHin-the-HTML-templates-configuration-settings 
added the unit tests for the default currency settings
 2014-11-27 17:05:19 +05:00
Ben Patterson
22fb193b36 Enforce pylint violation when using old event tracker. 2014-11-26 16:50:15 -05:00
John Jarvis
209ea51c28 merging from master 2014-11-26 16:21:16 -05:00
John Jarvis
2f0f011a21 config refactor wip 2014-11-26 21:14:39 +00:00
Greg Price
b8c5b9847e Merge pull request #6076 from edx/gprice/last-visited-module-path 
Add last visited module path to course status API
 2014-11-26 16:03:37 -05:00
Molly de Blanc
763b29d004 Merge pull request #6074 from stvstnfrd/requirements/license 
RFC: Update contact info for licensing questions
 2014-11-26 15:19:28 -05:00
stv
edb6c161d6 Lower PEP8 threshold to 0 violations 2014-11-26 15:19:06 -05:00
stv
a86777eb4e Fix PEP8: E303 too many blank lines 2014-11-26 15:19:04 -05:00
stv
c7e7b5622a Update contact info for licensing questions 2014-11-26 15:16:04 -05:00
John Eskew
59801de232 Merge pull request #6051 from edx/jeskew/asset_xml_input_output 
Implement XML input/output for AssetMetadata.
 2014-11-26 15:12:24 -05:00
stv
b2ff02f0e1 Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-26 15:10:04 -05:00
Greg Price
3a7e125109 Add last visited module path to course status API 2014-11-26 14:16:19 -05:00
stv
f1cd35ac0b Fix PEP8: E301 expected 1 blank line, found 0 2014-11-26 12:47:16 -05:00
frances botsford
b56d074648 Merge pull request #6057 from gymnasium/master 
Fixing horizontal scroll bug for long component titles
 2014-11-26 12:26:02 -05:00
Sarina Canelake
736a99e076 Merge pull request #6045 from stvstnfrd/pep8/except 
Fix exception-related PEP8 issues
 2014-11-26 12:18:26 -05:00
David Baumgold
b6984ee1e3 Merge pull request #6066 from stvstnfrd/debt/supertrace 
Remove antiquated trace script
 2014-11-26 11:37:25 -05:00
David Baumgold
84f809849f Merge pull request #6010 from Stanford-Online/kluo/fix-diff-branch-option 
Fix diff branch paver option to take value
 2014-11-26 11:31:30 -05:00
Stephen Sanchez
ebeaaaadeb Merge pull request #6073 from edx/sanchez/add_email_optin_api_endpoint 
Create new API endpoint for email optin
 2014-11-26 10:53:00 -05:00
John Eskew
29dcd88eef Implement XML input/output for AssetMetadata. 
Add tests which validate XML using XSD.
 2014-11-26 09:28:54 -05:00
stephensanchez
6214365158 Create new API endpoint for email optin 
Updating the design of the email opt in end point.

Updating API call based on new Org Model.
 2014-11-26 14:12:58 +00:00
zubair-arbi
9fd2b0013e Merge pull request #6049 from Shrhawk/shr/bug/TNL-290-incorrect-message-duplicate-course 
Modify error message
 2014-11-26 19:03:52 +05:00
Syed Hassan Raza
50ee031151 Modify error message 2014-11-26 11:18:50 +05:00
stv
261f275efd Remove antiquated trace script 
This library was originally written to trace local variables. In the
more than two years since it was originally written, the only update it
has received was to remove PEP8/PyLint/quality violations.

It's hard to imagine that this is still useful to anyone, though I'm
open to discussion.
 2014-11-26 01:06:37 -05:00
stv
ee5dae2fa7 Remove antiquated cleanup script 
This script was originally written to clean up XML scripts. In the more
than two years since it was originally written, the only updates it has
received have been to remove PEP8/PyLint/quality violations.

It's hard to imagine that this is still useful to anyone, though I'm
open to discussion.
 2014-11-25 22:49:36 -05:00
Stephen Sanchez
e3dcb78d4e Merge pull request #6056 from edx/sanchez/create_user_org_tag 
Creating a new Organization based preference model.
 2014-11-25 16:41:13 -05:00