Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

10459 Commits

Author SHA1 Message Date
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212 
MA-212 Mobile API support for backward compatibility of course updates.
 2015-01-09 10:05:59 -05:00
Dennis Jen
17c2af2325 Merge pull request #6513 from edx/release 
Merge release back into master
 2015-01-09 09:15:57 -05:00
Jesse Zoldak
d29127055e Merge pull request #6509 from edx/zoldak/fix-textbook-test 
Fix flaky textbook upload lettuce tests
 2015-01-09 07:45:05 -05:00
Adam Palay
63431d1ffd fix studio templating errors 2015-01-08 19:47:15 -05:00
Jesse Zoldak
3efb377d1c Fix flaky textbook upload lettuce tests 2015-01-08 16:52:55 -05:00
Adam Palay
62157f3725 set studio_name in aws.py (TNL-1138) 2015-01-08 16:28:01 -05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
Adam Palay
8fa00ea54c update studio footer copyright date 2015-01-08 14:45:53 -05:00
Steve Jackson
531dbbe3b9 [TNL-140] Fix unresponsive Studio login error message 
Clear the 'invalid login' error message when the user edits her username
or password.  This fix makes makes it clear that future attempts to
login are not being ignored if they continue to generate the same error.

Add an acceptance test case to verify this behavior.

Fixes https://openedx.atlassian.net/browse/TNL-140
 2015-01-08 10:48:45 -08:00
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00
David Baumgold
96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org 2015-01-08 12:42:26 -05:00
Nimisha Asthagiri
3498eeb1f6 MA-212 Mobile API support for backward compatibility of course updates. 2015-01-08 10:05:29 -05:00
David Baumgold
82d02851a7 Merge pull request #6468 from edx/studio-name-by-default 
Use "Studio" name by default (instead of "edX Studio")
 2015-01-07 12:04:49 -05:00
Ned Batchelder
36e879a4f0 Need to add new XBlocks to the ADVANCED_COMPONENTS list 2015-01-07 11:42:46 -05:00
stephensanchez
1e7d567b58 Initial framework for the Course About API. 
ECOM-248 Course Info API. Basic functionality implemented.

ECOM-248 adding factory for about descriptor and test cases for course info api

ECOM-248 adding test cases for couse info api.

ECOM-248 re-factoring code. updating test cases.

Tests for course_about data module

ECOM-248 Adding test cases for the exceptions.

ECOM-248 re-factoring code. fixing quality issues.

ECOM-248 fixing test cases and moved parse video method into utils.

added github username in authors

ECOM-248 removed merging issue of test_data

ECOM-248 removed unused files
 2015-01-07 20:03:54 +05:00
Brian Talbot
9dd22206ae Merge pull request #6055 from edx/clrux/update-font-awesome-4.2.0-v2 
Upgrade: Font Awesome 4.2.0 - Take #2
 2015-01-06 18:36:44 -05:00
David Baumgold
260962e06c Use "Studio" name by default (instead of "edX Studio") 2015-01-06 16:07:57 -05:00
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
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -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
Adam Palay
7837607ca9 only recusively delete modules if all their parents are marked for deletion (PLAT-333) 
update '_delete_item' method for draft only modules and update delete_orphans management command

fix test_courseware which fails due to invalid future date
 2015-01-05 14:54:17 -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