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

5490 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
66b1778481 Merge pull request #6353 from rocha/set-revision-to-unknown-if-not-on-git-repo 
Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
 2015-01-06 15:39:40 -05:00
Marco Morales
f91c5ffd1f Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup 
SASS compilation variable conventions update
 2015-01-06 14:47:24 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
Marco Morales
7d110a86d4 cleanup to PR feedback for shoppingcart and instructor2 scss partials 2015-01-05 18:57:58 -05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
David Baumgold
20220dc3eb Merge pull request #6418 from edx/translate-placeholder-text 
Placeholder text should be translated
 2015-01-05 09:21:03 -05:00
David Baumgold
609f642059 Placeholder text should be translated 2014-12-31 09:27:52 -05:00
David Baumgold
4dd265a380 target="_blank" should not be translated 
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-target
 2014-12-31 09:16:43 -05:00
Syed Hassan Raza
55052c1aaf Change label for value 
TNL-998
 2014-12-30 15:19:35 +05:00
Carlos Andrés Rocha
75cfcd7292 Set EDX_PLATFORM_REVISION to unknown if not in a git repo. 
- Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
- Use the path of the configuration file to determine where the
  repository is.
 2014-12-24 14:50:10 -05:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
David Baumgold
320941e850 Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME 2014-12-23 13:32:15 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio 
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
 2014-12-23 11:14:58 -05:00
David Baumgold
5360d77b79 Refactor sock HTML to have text in Mako template 2014-12-19 14:20:14 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}" 
For theming and internationalization
 2014-12-19 13:58:42 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -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
David Baumgold
708fd87bb6 Merge pull request #6310 from edx/studio-translate-program-manager 
Do a better job translating "Program Manager"
 2014-12-18 16:10:43 -05:00
Don Mitchell
d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides 
make asides render in studio
 2014-12-18 15:41:58 -05:00
Don Mitchell
d49c82f9bd Add configuration to studio for asides 2014-12-18 14:43:22 -05:00
David Baumgold
198e9c7c0e Do a better job translating "Program Manager" 2014-12-18 14:33:12 -05:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio. 
TNL-920
 2014-12-18 11:42:18 +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 Jarvis
128d763047 Merge pull request #6218 from edx/jarv/env-revision-override 
optionally using environment variable for edx-platform hash
 2014-12-17 11:37:13 -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
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -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
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
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
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
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
Daniel Friedman
7e2e90e409 Fix typo in cms unit test 2014-12-12 14:01:42 -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
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
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