Commit Graph

27109 Commits

Author SHA1 Message Date
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
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
Greg Price
3a7e125109 Add last visited module path to course status API 2014-11-26 14:16:19 -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
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
stephensanchez
19f737d544 Creating a new Organization based preference model. 2014-11-25 20:17:31 +00:00
stv
ab441dbca1 Lower PEP8 threshold to 5 violations 2014-11-25 14:42:06 -05:00
stv
29d3e69401 Fix PEP8: W602 deprecated form of raising exception 2014-11-25 14:42:04 -05:00
Mike Bifulco
f6b50f5df4 Bug fix for TNL-406
TNL-406: Long component title causes horizontal scroll
updated the SASS file to address the horizontal scroll issue in long
component titles’ hover bubble.
2014-11-25 13:38:53 -05:00
Mike Bifulco
c7aa6986bb Adding myself to AUTHORS 2014-11-25 13:37:01 -05:00
Sarina Canelake
3393f25f04 Merge pull request #6044 from stvstnfrd/pep8/syntax
Fix syntax-related PEP8 issues
2014-11-25 12:52:12 -05:00
stv
ab4de714fb Lower PEP8 threshold to 10 violations 2014-11-25 10:56:36 -05:00
stv
988144f0b4 Fix PEP8: E712 comparison to True
should be 'if cond is True:' or 'if cond:'
2014-11-25 10:16:05 -05:00
stv
31d094b5b4 Fix PEP8: E711 comparison to None
should be 'if cond is None:'
2014-11-25 10:16:05 -05:00
stv
74f61875c7 Fix PEP8: W601 .has_key() is deprecated, use 'in' 2014-11-25 10:16:05 -05:00
stv
829be1e9cb Fix PEP8: E502 the backslash is redundant
between brackets
2014-11-25 10:16:04 -05:00
Akiva Leffert
b009e4a5ca Merge pull request #5979 from edx/aleffert/sync-course-status
Add an endpoint for syncing a user's course status metadata
2014-11-25 10:15:51 -05:00
stv
ac1d643e24 Fix PEP8: E401 multiple imports on one line 2014-11-25 10:15:07 -05:00
Muhammad Ammar
6317347d3d Merge pull request #5983 from edx/ammar/tnl-827
Remove ability to add new ORA 1 problems to courses
2014-11-25 19:23:12 +05:00
Sarina Canelake
a883a9cdda Merge pull request #5925 from stvstnfrd/pep8/continuation
Fix continuation-related PEP8 issues
2014-11-25 09:03:40 -05:00
Waheed Ahmed
7b3602e320 Merge pull request #6047 from edx/waheed/tnl536-fixed-hd-button-for-firefox
Fixed HD button in firefox.
2014-11-25 16:32:17 +05:00
Waheed Ahmed
86f72942f5 Fixed HD button in firefox.
TNL-536
2014-11-25 14:39:56 +05:00
stv
5e1c5df320 Lower PEP8 threshold to 15 violations 2014-11-24 20:49:56 -05:00
stv
6823cb6306 Lower PyLint threshold to 4600 violations 2014-11-24 20:49:31 -05:00
stv
ae7eb2f79f Remove orphaned code 2014-11-24 20:48:05 -05:00
stv
056faa1814 Fix Pylint: W0201: attribute-defined-outside-init
LoginEnrollmentTestCase.setup_user: Attribute 'user' defined outside __init__
2014-11-24 20:48:05 -05:00
stv
b4c4d18e9f Fix Pylint: W0110: (deprecated-lambda)
divide_chemical_expression: map/filter on lambda could be replaced by
comprehension
2014-11-24 20:48:05 -05:00
stv
11020cf115 Fix Pylint: C0103: (invalid-name)
Command.handle: Invalid name "d" for type variable
(should match [a-z_][a-z0-9_]{2,30}$)
2014-11-24 20:48:05 -05:00
stv
0d2754d8d1 Fix PEP8: E502 the backslash is redundant
between brackets
2014-11-24 20:48:05 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented
for visual indent
2014-11-24 20:46:50 -05:00
stv
4d30aedf4e Fix PEP8: E127 continuation line over-indented
for visual indent
2014-11-24 20:46:50 -05:00
stv
6763c5dd74 Fix PEP8: E126 continuation line over-indented
for hanging indent
2014-11-24 20:46:44 -05:00
stv
2ce5a6ceed Fix PEP8: E125 continuation line
does not distinguish itself from next logical line
2014-11-24 20:46:44 -05:00
stv
aba9b3b96e Fix PEP8: E124 closing bracket does not match
visual indentation
2014-11-24 20:46:44 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match
indentation of opening bracket's line
2014-11-24 20:46:44 -05:00
stv
55de42d19c Fix PEP8: E122 continuation line missing
indentation or outdented
2014-11-24 20:46:35 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation
is not a multiple of four
2014-11-24 20:44:43 -05:00