Commit Graph

35719 Commits

Author SHA1 Message Date
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
2016-03-18 17:15:00 -04:00
Ned Batchelder
2536c58920 Merge pull request #11835 from edx/ned/updated-translations
Update translations (autogenerated message)
2016-03-17 15:46:41 -04:00
Ben Patterson
4660055e07 Merge pull request #11411 from edx/benp/shard2-lms
Create a third shard for lms unit tests.
2016-03-17 13:23:30 -04:00
Braden MacDonald
8aff51bfac Merge pull request #11818 from open-craft/omar/problem-builder
Update problem-builder to version 2.0.3
2016-03-17 10:12:55 -07:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests.
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
2016-03-17 12:01:42 -04:00
Ned Batchelder
6883f21542 Update translations (autogenerated message) 2016-03-17 10:54:37 +00:00
Toby Lawrence
9b8ff773ee Merge pull request #11824 from edx/release
Merge release back to master.
2016-03-16 21:11:37 -04:00
Andy Armstrong
7ead068a4e Merge pull request #11813 from edx/andya/upgrade-requirejs
Upgrade RequireJS
2016-03-16 14:24:27 -04:00
Jesse Zoldak
f01f36a541 Merge pull request #11822 from edx/zoldak/revert-pr11613
Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
2016-03-16 13:23:42 -04:00
Peter Fogg
954504d72c Merge pull request #11786 from edx/peter-fogg/course-home-a11y
Accessibility fixes for the course home page.
2016-03-16 12:45:17 -04:00
Andy Armstrong
06daf79b94 Upgrade RequireJS
FEDX-105
2016-03-16 12:42:00 -04:00
Toby Lawrence
3d95bd542c Merge pull request #11793 from edx/rc/2016-03-16
Release Candidate rc/2016-03-16
2016-03-16 12:40:17 -04:00
Diana Huang
9242d97bd9 Merge pull request #11817 from edx/diana/hide-video-error
Use is-hidden instead of hidden for video errors.
2016-03-16 11:31:38 -04:00
Toby Lawrence
cac35ee2a1 Merge pull request #11823 from edx/releng/revert-ecom-2947
Revert ECOM-2947.
2016-03-16 11:25:07 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Toby Lawrence
a32ee429a3 Revert "Fixed the other half of forgot password flow accourding to logistration."
This reverts commit 178f5a6056.
2016-03-16 11:19:01 -04:00
Omar Khan
2a5fce94c8 Update problem-builder to version 2.0.3 2016-03-16 07:23:28 +07:00
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00
Nimisha Asthagiri
b91f940af7 Merge pull request #11664 from mitocw/feature/gs/visible_to_staff_only
Added visible_to_staff_only field to course blocks API
2016-03-15 17:16:53 -04:00
George Schneeloch
6b8f372178 Added visible_to_staff_only field to course blocks API 2016-03-15 16:06:30 -04:00
Toby Lawrence
aba4e58836 Merge pull request #11814 from edx/clintonb/req-fix
Reverted rfc6266 change
2016-03-15 15:44:33 -04:00
Clinton Blackburn
ae0a128966 Reverted rfc6266 change
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
2016-03-15 15:37:21 -04:00
M. Rehan
31cd7afc1c Merge pull request #11811 from edx/mrehan/tnl-4219-progress-detail-not-shown
render progress status while problem content rendering
2016-03-15 20:16:27 +05:00
Qubad786
167efea65c render progress status while problem content rendering 2016-03-15 19:53:30 +05:00
attiyaIshaque
a3caac1fcc Merge pull request #11789 from edx/atiya/ECOM-3613-certificates-email-address
Email address with '+' is accepted by Student Support.
2016-03-15 19:17:10 +05:00
Sven Marnach
d29dcc1697 Merge pull request #11803 from open-craft/smarnach/update-dndv2-version
Bump the version of the Drag&Drop XBlock to 2.0.4.
2016-03-15 14:14:53 +01:00
Matt Drayer
a25caf31c3 Merge pull request #11613 from edx/ziafazal/WL-328
Ziafazal/wl-328 multi-tenancy support in Comprehensive Theming
2016-03-14 15:21:54 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Diana Huang
01ef2c9a45 Merge pull request #11776 from edx/efischer/tnl-4132
Flaky Matlab Tests
2016-03-14 13:42:04 -04:00
Eric Fischer
83e586d137 Merge pull request #11774 from edx/efischer/tnl-4151
Flaky Discussion Tests
2016-03-14 12:39:09 -04:00
Muzaffar yousaf
415c0ea6d0 Merge pull request #11802 from edx/mzfr/notes-bug
Properly escape mixed content. text + html.
2016-03-14 21:10:00 +05:00
Eric Fischer
41e1e27df5 Wait for element visibility instead of AJAX. 2016-03-14 11:19:37 -04:00
Sven Marnach
6d9598f325 Bump the version of the Drag&Drop XBlock to 2.0.4. 2016-03-14 16:07:57 +01:00
muzaffaryousaf
d43f33db31 Properly escape mixed content. text + html.
TNL-4243
2016-03-14 19:52:58 +05:00
Eric Fischer
c46e5c1cb0 Fix flaky discussion tests
Ajax callbacks are used in a lot of places in discussions; our tests
need to wait for those callbacks to finish in several places.
2016-03-14 10:27:15 -04:00
Ben Patterson
90c864d418 Merge pull request #11798 from edx/benp/sol-430-again
Flagging other library import bok-choy test as flaky.
2016-03-14 09:23:59 -04:00
Attiya Ishaque
751890b3da Email address with '+' is accepted by Student Support. 2016-03-14 18:11:19 +05:00
Ben Patterson
04cc6969ef Flagging other library import bok-choy test as flaky. 2016-03-12 12:48:13 -05:00
Nimisha Asthagiri
a1458b99f8 Merge pull request #11684 from CredoReference/feature/edx-23-new
New optional parameters for course blocks API: lti_url, block_types_filter
2016-03-11 17:09:41 -05:00
Ben Patterson
3a95597316 Merge pull request #11795 from edx/benp/te-1200
Flag two tests as flaky. See inline comments for JIRA tickets.
2016-03-11 14:17:23 -05:00
Ben Patterson
94c0a54664 Flag two tests as flaky. See inline comments for JIRA tickets. 2016-03-11 13:18:54 -05:00
Toby Lawrence
4debb4a26b Merge pull request #11784 from edx/PERF-265
Move any uncached JS to be cached
2016-03-11 11:27:41 -05:00
Matt Drayer
5272b7e35c Merge pull request #11575 from edx/mattdrayer/xblock-translations
mattdrayer/xblock-translations: I18N/L10N for XBlocks
2016-03-11 10:58:49 -05:00
Matt Drayer
3ed3fea2fb mattdrayer/xblock-translations: Add I18N/L10N support to XBlocks via the runtime
* mattdrayer:  Latest proto code
* mattdrayer:  Add translation.py
* asadiqbal08: Xblock translation ugettext update, remove translation.py
* mattdrayer:  Additional I18N work -- starting to see some translations!
* asadiqbal08: Trying to make xBlock message catalog files path dynamic
* mattdrayer:  Remove unnecessary modifications
* mattdrayer:  Cleaned up implementation
* mattdrayer:  Moved import statement
* asadiqbal08: update as suggested
* asadiqbal08: xblock its own domain
* asadiqbal08: translation: secure none object
* asadiqbal08: pylint
* asadiqbal08: get locale from xblock
* asadiqbal08: update
* mattdrayer:  Determine XBlock locale path within runtime service
* mattdrayer:  Determine module location via the runtime
* mattdrayer:  Remove ModuleI18nService reference
* asadiqbal08: override the service in studio
* asadiqbal08: remove import
* asadiqbal08: update the Modulei18nService
* asadiqbal08: update the Modulei18nService
* mattdrayer:  Remove redundant __class__ reference
* asadiqbal08: update the docstring
* asadiqbal08: tests
* mattdrayer:  Remove specific ugettext override from ModuleI18nService
* mattdrayer:  Move service operation to base class
* mattdrayer:  Address quality violations
* asadiqbal08: Investigating the test failure issue on jenkins and solved
* asadiqbal08: First utilizing the parent class method
* mattdrayer:  Use recommended callable approach
* asadiqbal08: remove unused code
* asadiqbal08: Updated the test to use cms preview module system runtime in order to get i18n service.
* asadiqbal08: Pylint quality
* asadiqbal08: update the service call to check xblock declarations
* asadiqbal08: update doc string
* asadiqbal08: i18n callable test in studio
* asadiqbal08: test lms runtime for modulei18n service
* asadiqbal08: add doc strings
* asadiqbal08: Rename locale and domain to Flask-Babel convention
2016-03-11 09:55:15 -05:00
Clinton Blackburn
6fef56977c Merge pull request #11778 from edx/clintonb/update-requirements
Replaced Git requirements with PyPI
2016-03-11 09:53:09 -05:00
Peter Fogg
9188f9682c Accessibility fixes for the course home page.
ECOM-3799
2016-03-11 09:48:44 -05:00
Toby Lawrence
4eb95737b5 Update and take advantage of our ability to override RequireJS paths.
We had a mechanism to, at runtime, generate a RequireJS config that
would override the base paths and, instead, use the hashed versions of
assets for things that RequireJs was loading on demand.

We've now moved that out of the coureware.html base template and into
main.html so that more pages actually benefit from it.

As well, we've added some of the heavy hitters for unhashed assets,
namely moment.min.js, to these overrides which should allow better
caching for end users.  We'll be able to add more things to the override
list in the future as they crop up.
2016-03-11 08:56:45 -05:00
Ned Batchelder
0812157039 Merge pull request #11783 from edx/ned/update-translations
Update translations (autogenerated message)
2016-03-10 19:44:16 -05:00
Clinton Blackburn
9c90de6507 Replaced Git requirements with PyPI
Each of the replaced commits can be sourced from PyPI rather than Git. Also, django-pipeline does not need to be editable.

ECOM-3833
2016-03-10 17:26:32 -05:00
Ned Batchelder
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00:00