Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 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
zubair-arbi
5371d17312 Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error 
fix location revision error for multi parent draft
 2014-12-16 19:39:27 +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
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00
chrisndodge
cb1058ac00 Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar 
MIT: Course Information Page side bar
 2014-12-15 20:46:22 -05:00
AlasdairSwan
70c2adb9ef Merge pull request #6264 from edx/alasdair/dashboard-prof-ed-banner 
ECOM-728 updated dashboard course banners so all types of course are now...
 2014-12-15 16:14:09 -05:00
Fred Smith
c4bbf49b1e Merge pull request #6265 from edx/sarina/2014-12-15-translations-updates 
Update translations (autogenerated message)
 2014-12-15 15:54:51 -05:00
Sarina Canelake
f70e531df9 Update translations (autogenerated message) 2014-12-15 12:40:36 -08:00
chrisndodge
c46c247e46 Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list 
also apply sorting rules overrides to the /courses view
 2014-12-15 15:34:39 -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
AlasdairSwan
9b59e387b5 ECOM-728 updated dashboard course banners so all types of course are now supported as per the new design. Included some other small tweaks to other text on the page in consultation with AndyWaldrop 2014-12-15 15:08:40 -05:00
Will Daly
788cc350dd Merge pull request #6260 from edx/will/combine-intro-and-make-payment 
Combine payment and intro step
 2014-12-15 14:59:26 -05:00
Renzo Lucioni
c6b1ca34a7 Merge pull request #6263 from edx/renzo/full-name-placeholder 
Use current full name as placeholder text
 2014-12-15 14:34:23 -05:00
Renzo Lucioni
9874a8d396 Use current full name as placeholder text 2014-12-15 14:25:31 -05:00
Chris Dodge
483cccb657 also apply sorting rules overrides to the /courses view 2014-12-15 14:11:58 -05:00
Ben Patterson
a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init 
Mock out the underlying segment-io call.
 2014-12-15 13:44:54 -05:00
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Chris
578c96a8c3 Studio video upload feature template and styling 
Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:22:02 -05:00
Will Daly
18f6980922 Merge pull request #6247 from edx/will/update-verified-requirements 
Separate verification / payment flow.
 2014-12-15 13:11:45 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -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
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Will Daly
49cb0486a6 Merge pull request #6245 from edx/will/email-opt-in-updates 
Add header row to email opt in list; add default date
 2014-12-15 12:13:27 -05:00
Adam Palay
5c1834b623 fix preview link generation for course reruns (PLAT-336) 2014-12-15 10:09:40 -05:00
Adam
ce89823f1a Merge pull request #6233 from edx/adam/fix-preview-courseruns 
fix preview link generation for course reruns (PLAT-336)
 2014-12-15 10:01:26 -05:00
Adam Palay
59343ed63f fix preview link generation for course reruns (PLAT-336) 2014-12-15 09:21:38 -05:00
zubair-arbi
99b86d7b0f fix location revision error for multi parent draft 
PLAT-332
 2014-12-15 17:32:48 +05:00
Will Daly
5df1ffebc1 Add header row to email opt in list; add default date 2014-12-15 06:13:47 -05:00
zubair-arbi
baaf5fa8a7 Merge pull request #6210 from edx/zub/bugfix/tnl-922-key-error-getting-position 
set position to default value if POST request don't have position argume...
 2014-12-15 16:02:30 +05:00
zubair-arbi
1d6d2f2a7f set position to default value if POST request don't have position argument 
TNL-922
 2014-12-15 11:59:52 +05:00
wwj718
3caf14e3de variable name error 
The variable name --- `dist` error
`dist` = {}  will cover `dist = grades.answer_distributions(course.id)`
 2014-12-15 10:46:03 +08:00
chrisndodge
8a685ceca0 Merge pull request #6242 from edx/cdodge/move-shoppingcart-button-detection 
change the context_processor in the shopping cart to return a pointer to...
 2014-12-14 13:15:03 -05:00
Chris Dodge
1148366998 change the context_processor in the shopping cart to return a pointer to a function so that only the templates that actually need to know if the shopping cart button should be shown will actually make the database roundtrips 2014-12-14 11:34:19 -05:00
Ben Patterson
e0f83ded6d Pipe analytics client output to stdout instead of devnull. 2014-12-13 20:02:53 -05:00
Ben Patterson
352fce6e02 Fix another analytics.init secret error message (noise). 2014-12-13 19:28:15 -05:00
Calen Pennington
d0b3fcc09c Merge pull request #6162 from cpennington/xblock-asides 
XBlockAsides in LMS
 2014-12-13 10:08:52 -05:00
Calen Pennington
822eaa20c6 Make ErrorDescriptor more resistent to errors 2014-12-13 08:26:28 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Ben Patterson
7be7b50ba9 Mock out the underlying segment-io call. 
TE-532
 2014-12-12 21:47:43 -05:00
Calen Pennington
e20fe2b879 Add a configuration model for managing XBlockAsides 2014-12-12 21:45:21 -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
Calen Pennington
42792e978c Extract common base functionality for storing xblock fields in the relation db 2014-12-12 21:45:21 -05:00
Calen Pennington
ccbff2dafc Make a generic django field for storing OpaqueKey classes 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
a63013c292 Merge pull request #6239 from edx/clytwynec/fix_pep8_violation 
fix pep8 violation
 2014-12-12 16:25:39 -05:00
Christine Lytwynec
197f50b980 fix pep8 violation 2014-12-12 16:22:00 -05:00
Daniel Friedman
5be9488f3f Merge pull request #6235 from edx/dan-f/fix-test-typo 
Fix typo in cms unit test
 2014-12-12 15:42:44 -05:00
Christine Lytwynec
b24a237cee Merge pull request #6232 from edx/clytwynec/fix_failing_cohort_test 
fixes failing unit test in course_groups
 2014-12-12 15:21:13 -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