Commit Graph

13595 Commits

Author SHA1 Message Date
Muddasser
79c5a792e8 Removed duplicate lettuce test from data_download.feature 2016-03-17 14:39:40 +05: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
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
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
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00
George Schneeloch
6b8f372178 Added visible_to_staff_only field to course blocks API 2016-03-15 16:06:30 -04: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
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
muzaffaryousaf
d43f33db31 Properly escape mixed content. text + html.
TNL-4243
2016-03-14 19:52:58 +05:00
Attiya Ishaque
751890b3da Email address with '+' is accepted by Student Support. 2016-03-14 18:11:19 +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
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
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
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
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00: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
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
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
sanfordstudent
5c0ca8c6ea Merge pull request #11756 from edx/sstudent/MA-2103
Sstudent/ma 2103
2016-03-09 11:04:08 -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
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03: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
Sanford Student
6490551f1b MA-2103 2016-03-08 16:17:01 -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
Waheed Ahmed
178f5a6056 Fixed the other half of forgot password flow accourding to logistration.
ECOM-2947
2016-03-08 12:14:24 +05:00
Hassan
fb2998172d Merge pull request #11660 from edx/hassan/dump-course-ids-fix
Include CCX courses in dump_course_ids.
2016-03-08 01:45:06 +05:00
Michael Frey
5dcdf9a46b Merge pull request #11755 from edx/SOL-1690
Redirect to otto checkout for prof ed courses if enabled
2016-03-07 15:09:23 -05:00
clrux
4f5290e464 Merge pull request #11764 from edx/clrux/ac-328-lessening-specificity
Lessening specificity for headings
2016-03-07 14:30:37 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
Christina Roberts
e1889fb85e Merge pull request #11763 from edx/christina/remove-unnecessary-escaping
The escaping is unnecessary and confusing to the user.
2016-03-07 13:58:58 -05:00