Commit Graph

9733 Commits

Author SHA1 Message Date
stv
1164624fbc Fix PEP8: W291 trailing whitespace 2014-11-10 19:31:09 -08:00
stv
cb894cf35e Fix PEP8: E261 at least two spaces before inline comment 2014-11-10 19:31:09 -08:00
stv
180adfed52 Fix PEP8: E251 unexpected spaces around keyword / parameter equals 2014-11-10 19:31:09 -08:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
b388ab9db0 Fix PEP8: E226 missing whitespace around arithmetic operator 2014-11-10 19:30:18 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08:00
stv
41390f0239 Fix PEP8: E222 multiple spaces after operator 2014-11-10 19:30:18 -08:00
stv
96ce219d80 Fix PEP8: E211 whitespace before '(' 2014-11-10 19:30:17 -08:00
stv
02e224df1f Fix PEP8: E203 whitespace before ':' 2014-11-10 19:30:13 -08:00
stv
0196048359 Fix PEP8: E202 whitespace before '}' 2014-11-10 17:07:41 -08:00
stv
0fdf8fb222 Fix PEP8: E201 whitespace after '{' 2014-11-10 17:07:40 -08:00
Sarina Canelake
0bf0d11a20 Merge pull request #5906 from stvstnfrd/pep8/newline
Fix newline-related PEP8 issues
2014-11-10 15:29:06 -05:00
stv
5677b143db Fix PEP8: W391 blank line at end of file 2014-11-10 11:00:18 -08:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d9502e48de Fix PEP8: E301 expected 1 blank line, found 0 2014-11-10 11:00:07 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08:00
David Baumgold
18083e9879 Use @require_POST decorator for password reset view 2014-11-10 12:07:22 -05:00
Usman Khalid
96b1a17b66 Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2
Proxy to retry on mongo Autoreconnect errors.
2014-11-10 19:56:11 +05:00
Waheed Ahmed
c397495eb9 Fixed null answer in checkbox problem as incorrect.
TNL-765
2014-11-10 18:41:26 +05:00
Waheed Ahmed
3a71901f93 Fixed youtube stub server and removed unused variable.
TNL-778
2014-11-10 11:43:58 +05:00
chrisndodge
c4a957c159 Merge pull request #5876 from edx/cdodge/catalog-visibility
Add new course_module field which describes what the catalog visibility ...
2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Sarina Canelake
2cdbabc0b8 Merge pull request #5880 from edx/sarina/name-branded-assets-in-common
Sarina/name branded assets in common
2014-11-07 11:13:51 -05:00
Sarina Canelake
4e9bf5e104 Last reference removed in 3b2c970248 [OPEN-299] 2014-11-07 09:50:45 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution.
TNL-729
2014-11-07 19:16:49 +05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page
allow for a customized region on the receipt page that is microsite bran...
2014-11-06 21:13:43 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -05:00
Usman Khalid
5fa1104787 Wrapped Split MongoConnection in MongoProxy.
PLAT-71
2014-11-06 20:13:45 +05:00
Usman Khalid
4a969f9f1b Added autoretry_read decorator to methods which use mongo cursor.
PLAT-71
2014-11-06 20:13:45 +05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy.
PLAT-71
2014-11-06 20:13:45 +05:00
Don Mitchell
5491418cd5 Merge pull request #5847 from edx/dhm/generalize_assets
Generalize assets to any block_type but using
2014-11-05 17:32:56 -05:00
Don Mitchell
fc83c299ca Generalize assets to any block_type but using
AssetKey and the metadata store
PLAT-204
2014-11-05 16:01:50 -05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
Sarina Canelake
303b4e66e1 Merge pull request #5822 from edx/sarina/OPEN-303
Move all lms image files into lms/static/images [OPEN-303]
2014-11-05 10:58:02 -05:00
John Eskew
db682dae05 Merge pull request #5819 from edx/jeskew/asset_mongo_coursewide
Implement course-wide asset paging methods.
2014-11-05 10:05:32 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements
Unit Test Improvements
2014-11-05 19:55:39 +05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 18:49:38 -05:00
John Eskew
098bba16e1 Implement copy_all_asset_metadata for Old Mongo->Old Mongo.
Add tests for copying all asset metadata.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 11:38:56 -05:00
John Eskew
062e0b2174 Implement course-wide asset paging methods.
Add SortedCollection class to help sort lists efficiently.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 11:35:02 -05:00
Don Mitchell
436b32a66d Merge pull request #5800 from edx/dhm/xml_assetstore
Abstract asset methods into own interface class
2014-11-04 10:43:41 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8
Remove more pep8 violations
2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Don Mitchell
aa07355e87 Abstract asset methods into own interface class
then impl the read ones as NotImplementedError placeholders on xml modulestore
PLAT-70
2014-11-03 14:45:30 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events.
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
2014-11-03 14:12:07 -05:00
David Baumgold
688d4c968a Merge pull request #4806 from edx/talbs/studio-stylesweep-unused
Studio: Removing older/deprecated style rules
2014-11-03 13:36:05 -05:00
Christina Roberts
7f98540e21 Merge pull request #5808 from edx/zub/bugfix/tnl-138-createunitthrowserror
fix click event for actual target
2014-11-03 10:36:17 -05:00