Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

2554 Commits

Author SHA1 Message Date
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Don Mitchell
d49c82f9bd Add configuration to studio for asides 2014-12-18 14:43:22 -05:00
Don Mitchell
4360a78142 Studio render XBlockAside views 
PLAT-280
 2014-12-17 15:44:49 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
John Eskew
94ea35d3be Export modulestore-stored asset metadata as XML to exported course. 
Import asset metadata XML into modulestore.
Optimize importing many items of asset metadata by avoiding multiple
round-trips to MongoDB.
 2014-12-16 15:42:38 -05:00
David Baumgold
6b82489728 Merge pull request #5685 from edx/uncomment-thumbnail-tests 
Uncomment thumbnail tests
 2014-12-16 09:08:05 -05:00
Greg Price
ee103659dc Merge pull request #6257 from edx/mobile/video-pipeline-squashed 
Add video upload feature to Studio
 2014-12-15 15:18:52 -05:00
Greg Price
61cb51596d Add front end for Studio video upload feature 
Co-authored-by: Chris <crodriguez@edx.org>
Co-authored-by: Mark Hoeber <hoeber@edx.org>
 2014-12-15 13:09:59 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature 
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:09:59 -05:00
Adam Palay
5c1834b623 fix preview link generation for course reruns (PLAT-336) 2014-12-15 10:09:40 -05:00
Adam Palay
59343ed63f fix preview link generation for course reruns (PLAT-336) 2014-12-15 09:21:38 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
Christine Lytwynec
0bce5569e2 Merge pull request #6238 from edx/clytwynec/fix_failing_git_export_tests 
fix git_export tests
 2014-12-12 17:28:23 -05:00
Christine Lytwynec
197f50b980 fix pep8 violation 2014-12-12 16:22:00 -05:00
Christine Lytwynec
b9668acb32 fix git_export tests 2014-12-12 15:06:49 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8 
Update pep8 to 1.5.7
 2014-12-12 15:00:13 -05:00
Jesse Zoldak
b999714e1d Merge pull request #6111 from edx/zoldak/modulestore-test-config 
Unit test speed improvements
 2014-12-12 10:53:24 -05:00
Sarina Canelake
5c433ec9a1 Merge pull request #5731 from Stanford-Online/ataki/upstream 
Limit Upload File Sizes to GridFS
 2014-12-11 16:36:30 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
zubair-arbi
f62e5347e1 round-off weight, min_count and drop_count values while returing grading policy 
TNL-884
 2014-12-11 12:27:01 +05:00
Jesse Zoldak
77bbd30396 Do not create a modulestore unnecessarily in tests 2014-12-10 11:18:12 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Jim
fb9320afc1 Limit Upload File Sizes to GridFS. 
This commit puts a limit on the size of files that
course staff can upload to MongoDB. The limit is
enforced on the frontend in javascript as well
as backend via the /upload endpoint.

The limit is hard-coded in cms/envs/common.py and
may be changed according to the user's custom
needs.

If the user tries to upload a file that's too
large, an error message will pop up, with a
customizable url that pointing the user to an
external page with an alternate upload procedure.
This url is specified im cms/envs/common.py.
If not set, this url will not be displayed.
 2014-12-09 13:30:45 -08:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Adam Palay
27c710b85d don't export draft children of orphaned drafted (TNL-923) 2014-12-08 14:14:38 -05:00
Adam
896b191503 Merge pull request #6161 from edx/adam/fix-openended-draft-export 
fix export for openassessment drafts (PLAT-249)
 2014-12-08 09:25:09 -05:00
Adam Palay
bd6897894c fix export for openassessment drafts (PLAT-249) 2014-12-05 15:19:51 -05:00
stv
04b97a3ae1 Create helper function to remove duplicate code 
This repetitive code is especially pronounced in Stanford's fork, where
we have extended the About page to include several additional fields.

This pays down some technical debt by refactoring into a shared helper.
 2014-12-05 11:13:59 -08:00
Don Mitchell
3e1e4a4b25 Merge pull request #6123 from mitocw/bdero/move-course-role-check-to-student 
Moved has_course_access from CMS to student.auth (common)
 2014-12-05 11:35:16 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks 
TNL-670
 2014-12-05 09:55:00 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string 
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
 2014-12-02 22:08:58 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases 
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
 2014-12-02 07:09:36 -05:00
Sarina Canelake
520935209d s/pylint: disable=W0402/pylint: disable=deprecated-module/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
13946fb844 s/pylint: disable=W0511/pylint: disable=fixme/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
7229ef92ee s/pylint: disable=W0212/pylint: disable=protected-access/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
5f723e8d3c s/pylint: disable=W0703/pylint: disable=broad-except/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
f223ac8404 s/pylint: disable=W0401/pylint: disable=wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
90624ac4ba s/pylint: disable=R0915/pylint: disable=too-many-statements/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
d14c39a13e Fix exposed pylint violations 2014-12-01 11:22:10 -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
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
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