Commit Graph

35692 Commits

Author SHA1 Message Date
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
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
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
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
Jesse Zoldak
8ab50177de Merge pull request #11777 from edx/zoldak/fix-python-uninstall
Always uninstall python packages on the uninstall list
2016-03-10 13:05:48 -05:00
Eric Fischer
62bbea6b23 Merge pull request #11666 from edx/efischer/xblock_binding
Fix for ORA delete state TNL-4152
2016-03-10 12:45:37 -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
25e67370cd Unbound xblock method requires user id
clear_student_state(), a method defined by ORA, requires information
about the user making the request. Since this xblock is not bound,
we must provide that information explicitly.
2016-03-10 11:13:02 -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
Michael Frey
dbb840c576 Merge pull request #11773 from edx/release
Hotfix for March 9, 2016.
2016-03-10 10:23:12 -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
Matjaz Gregoric
6c1f7095a7 Merge pull request #11547 from open-craft/remove-course-about-nav
Remove course about 'Overview' link/tab.
2016-03-10 15:45:27 +01:00
lenacom
7e4f3fd00c fixed comment 2016-03-10 16:47:35 +03:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination
Notes pagination
2016-03-10 17:26:54 +05:00
Douglas Hall
656913c716 Merge pull request #11779 from edx/douglashall/SOL-1691/update_edx_proctoring_0_12_13
SOL-1653 SOL-1691 Upgrading edx-proctoring requirement to 0.12.13
2016-03-10 07:24:21 -05:00
Douglas Hall
dd0b74f7ee Upgrading edx-proctoring requirement to 0.12.13 2016-03-10 05:58:23 -05:00
Douglas Hall
fd318e05db Merge pull request #11767 from edx/ibrahimahmed443/SOL-1691
return course end date in credit service and rename flag
2016-03-10 05:52:06 -05:00
Matjaz Gregoric
3ad0a0073b Remove course about 'Overview' link/tab.
It looks like in the past there used to be several tabs on the
course about page, but the other tabs have been commented
out years ago.

Having a single tab is pointless and confusing, so remove it.
2016-03-10 11:05:09 +01:00
lenacom
2f2c6fc5da fixed comments 2016-03-10 11:21:06 +03:00
Jesse Zoldak
9251a6dc26 Always uninstall python packages on the uninstall list before installing the python requirements 2016-03-09 17:10:11 -05:00
Douglas Hall
2c3b728c08 Merge pull request #11749 from edx/hasnain-naveed/SOL-1654
SOL-1654 / Testing flakiness
2016-03-09 16:34:51 -05:00
sanfordstudent
5c0ca8c6ea Merge pull request #11756 from edx/sstudent/MA-2103
Sstudent/ma 2103
2016-03-09 11:04:08 -05:00
Peter Fogg
ab8fc07bbd Merge pull request #10645 from CourseTalk/coursetalk_widget
Integration CourseTalk widgets with OpenEdx.
2016-03-09 10:41:02 -05:00
Michael Frey
8df8b25f57 Merge pull request #11772 from edx/hotfix/2016-03-09
Redirect to otto checkout for prof ed courses if enabled
2016-03-09 10:33:08 -05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
lenacom
23b617492c removed a trailing space 2016-03-09 18:07:47 +03:00
lenacom
3aafbe591a fixed test changed by mistake 2016-03-09 16:57:45 +03:00
lenacom
f07bc1ce28 fixed comments 2016-03-09 16:52:02 +03:00
Michael Frey
abe330ccf0 Redirect to otto checkout for prof ed courses if enabled 2016-03-09 07:25:51 -05:00