Commit Graph

12924 Commits

Author SHA1 Message Date
Andy Armstrong
76b8e2e897 Merge pull request #11631 from edx/fedx/upgrade-libraries
Upgrade Underscore.js and Underscore.string.js
2016-03-18 16:32:16 -04:00
Toby Lawrence
f3d000ec18 Merge pull request #11812 from edx/PERF-276
Clear out usages of deprecated vendor prefixes.
2016-03-18 08:02:45 -04:00
sanfordstudent
658348da68 Merge pull request #11816 from edx/sstudent/MA-2164
MA-2164 adding youtube url to encoded videos
2016-03-18 06:41:04 -04:00
cahrens
e5c7fdda03 Upgrade underscore.string.min.js.
FED-68
2016-03-17 23:33:55 -04:00
Adam
ec57ee027d Merge pull request #11848 from edx/release
Release
2016-03-17 22:58:10 -04:00
Sanford Student
3893f3f069 MA-2164 add youtube when mobile video encoding missing 2016-03-17 19:59:33 -04:00
David Ormsbee
b8b7327e93 Revert "Make Capa problems do initial load without AJAX."
This reverts commit 9984bbc29a.
2016-03-17 14:26:04 -04:00
Toby Lawrence
9b8ff773ee Merge pull request #11824 from edx/release
Merge release back to master.
2016-03-16 21:11:37 -04:00
cahrens
a1f73f7ba8 Simplify how underscore.string is referred to. 2016-03-16 17:09:26 -04:00
cahrens
dd2a203677 Upgrade underscore to newest version.
FEDX-24
2016-03-16 17:08:27 -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
Andy Armstrong
06daf79b94 Upgrade RequireJS
FEDX-105
2016-03-16 12:42:00 -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
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00
Toby Lawrence
e2b8df7ec6 Clear out usages of deprecated vendor prefixes. 2016-03-15 11:57:38 -04:00
Qubad786
167efea65c render progress status while problem content rendering 2016-03-15 19:53:30 +05: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
41e1e27df5 Wait for element visibility instead of AJAX. 2016-03-14 11:19:37 -04: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
04cc6969ef Flagging other library import bok-choy test as flaky. 2016-03-12 12:48:13 -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
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
Christine Lytwynec
5b5b4eb4fc Merge pull request #11393 from edx/clytwynec/ac-238
Improve accessibility for dashboard course settings dropdown
2016-03-10 12:30:20 -05:00
John Eskew
2c78813380 Merge pull request #11768 from edx/jeskew/upgrade_to_django_1_8_11
Upgrade to Django 1.8.11.
2016-03-10 11:31:51 -05:00
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download
WIP: Asynchronous download button for ORA2 data
2016-03-10 11:09:36 -05:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
2016-03-10 10:32:22 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination
Notes pagination
2016-03-10 17:26:54 +05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
Peter Fogg
91fd6dbea2 Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course
Prevent ordering closed courses, and give a good user message.
2016-03-08 20:32:25 -05:00
Peter Fogg
fd2f3b69ef Prevent ordering closed courses, and give a good user message.
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
2016-03-08 16:45:49 -05:00
Ned Batchelder
a17eff7795 Merge pull request #11757 from stvstnfrd/debt/ie67
Remove deprecated IE6/7 polyfill
2016-03-08 14:45:52 -05:00
John Eskew
812aa6381e Upgrade to Django 1.8.11. Remove monkey patch required for v1.8.10. 2016-03-08 11:41:33 -05:00
Toby Lawrence
5a20f0b589 Merge branch 'master' into PERF-272 2016-03-08 08:53:36 -05:00
muzaffaryousaf
b095651655 Escape html/js with other bug fixes .
TNL-4164
2016-03-08 18:07:52 +05:00
Syed Hasan raza
7bdc762ebd Merge pull request #11662 from edx/shr/bug/AN-6713-decoding-errors
Add latin1 decoding to HTTP Headers
2016-03-08 16:08:46 +05:00
Syed Hassan Raza
0d6e0ac779 Add latin1 decoding to HTTP Headers 2016-03-08 12:44:55 +05:00
Toby Lawrence
1a3464152f Switch to header_control in contentserver. 2016-03-07 18:51:14 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
cahrens
2f3e3a55bb Remove unused profile name.
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
2016-03-07 09:37:39 -05:00
Christina Roberts
dbc2b4161e Merge pull request #11752 from edx/christina/remove-hinter
Delete hinter manager.
2016-03-07 09:35:56 -05:00
stv
1ff2ec15be Remove deprecated IE6/7 polyfill
This polyfill was added in late 2012 [1].
The final reference appears to have been removed in mid-2013 [2].

Regardless, we certainly are no longer supporting IE6/7.

[1] bf9f9c1c48
[2] 1388684194
2016-03-06 13:17:58 -08:00
cahrens
5432ef3b5e Make it clear that the logger methods are used by xblocks. 2016-03-05 17:14:15 -05:00
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule.
TNL-4195
2016-03-04 15:34:48 -05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe
Invalid display courseware through the LTI iframe in IE 10+
2016-03-04 15:29:42 -05:00
Jesse Zoldak
01e6fa81af Merge pull request #11654 from edx/zoldak/TE-1201
Convert tests for adding advanced problem components from lettuce to bok-choy
2016-03-04 15:14:25 -05:00