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

27430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
dbc6166f7e Merge pull request #6306 from edx/hotfix/2014-12-18 
Tender widget inavailability stops loading studio page
 2014-12-19 12:34:06 -05:00
Jesse Zoldak
60bfb13b1a for tests change the default xml data dir to a place where it will get cleaned up 2014-12-19 09:22:34 -05:00
Waqas Khalid
e653af4da2 Tender widget inavailability stops loading studio page 
When tender_widget.js is inavailable studio page stops
loading becuase of error in the requirejs. It is
dependency in the requirejs so when it doesn't load
it cause other dependencies to stop loading.

TNL-1018
 2014-12-19 09:22:34 -05:00
Christopher Lee
cff12eea1d Merge pull request #6317 from edx/hotfix/val-error 
updated commit hash for VAL
 2014-12-18 18:41:22 -05:00
christopher lee
7bf8221b89 updated commit hash for VAL 2014-12-18 17:04:19 -05:00
Fred Smith
66ab165594 Merge pull request #6291 from edx/hotfix/2014-12-17 
Hotfix/2014 12 17
 2014-12-17 17:08:30 -05:00
Adam Palay
4d2df01d7d update ora version 2014-12-17 13:47:39 -05:00
Waheed Ahmed
208ee26c2f Added test for OpenAssessmentBlock mixin. 
TNL-1022
 2014-12-17 13:47:38 -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
Chris Dodge
483cccb657 also apply sorting rules overrides to the /courses view 2014-12-15 14:11:58 -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
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
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
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
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
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
David Baumgold
48c349ffde Re-add and clarify comment 2014-12-12 14:19:49 -05:00
Daniel Friedman
7e2e90e409 Fix typo in cms unit test 2014-12-12 14:01:42 -05:00
Christine Lytwynec
3c1821a7ed fixes failing unit test in course_groups 2014-12-12 13:34:05 -05:00
Sarina Canelake
035a48046e Merge pull request #6230 from edx/sarina/fix-openedx-logo 
Change openedx footer image to a non-broken link
 2014-12-12 12:58:06 -05:00
Sarina Canelake
2e5b96768a Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub 
Implements keyword sub feature for bulk emails
 2014-12-12 12:57:21 -05:00
Sarina Canelake
d2b119914f Change openedx footer image to a non-broken link 2014-12-12 12:09:15 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary 
Check settings.FEATURES["ADVANCED_SECURITY"] first
 2014-12-12 11:53:02 -05:00
David Baumgold
e53263d937 Merge pull request #6225 from edx/studio-i18n-improvements 
Don't break up i18n string
 2014-12-12 11:09:58 -05:00
David Baumgold
e8d62ff6a8 Replace &mdash; with literal emdash 2014-12-12 11:09:26 -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
David Baumgold
4fcf1f9eae Move simplefilter comments before call 2014-12-12 10:47:58 -05:00
David Baumgold
838ce74a3f Add comments about disabled pep8 rules 2014-12-12 10:21:34 -05:00
David Baumgold
1fe72d89bf Double quotes for i18n string 2014-12-12 09:44:21 -05:00
David Baumgold
71a74c41c7 Don't break up i18n string 2014-12-12 09:43:27 -05:00
Shrhawk
cc377e8c38 Merge pull request #6211 from Shrhawk/shr/bug/TNL-964-navbar-display-display-issue 
Fix white spaces inside navigation
 2014-12-12 11:52:55 +05:00