Commit Graph

3580 Commits

Author SHA1 Message Date
Andy Armstrong
79f44357ab Merge pull request #11904 from edx/andya/static-html-utils
Add static HtmlUtils/StringUtils into edx namespace
2016-03-30 12:04:48 -04:00
Cliff Dyer
2c7241a3ce Merge pull request #11883 from edx/cdyer/safe-marathon-1
Added safety to lms/templates/student_account/account_settings.html
2016-03-30 11:14:39 -04:00
Andy Armstrong
2a204f7ffa Add static HtmlUtils/StringUtils into edx namespace
This is a temporary workaround for code that needs
access to these classes from the UI Toolkit but
without using RequireJS.
2016-03-30 10:30:39 -04:00
J. Cliff Dyer
32729eb838 Added safety to account_settings template 2016-03-29 19:37:15 +00:00
cahrens
bdef3bed9f Fix escaping in course discovery templates. 2016-03-29 14:28:57 -04:00
Christina Roberts
1fa1faeee5 Merge pull request #11903 from edx/christina/cohort-template-cleanup
Perform escaping in the templates.
2016-03-28 16:25:28 -04:00
cahrens
39dc8a5915 Perform esacaping in the templates.
Use new best practices.
2016-03-28 15:05:40 -04:00
Zia Fazal
a796b56314 saleem-latif/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
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
2016-03-25 10:02:38 -04:00
Waheed Ahmed
4399a5c7bd Fixed the other half of forgot password flow accourding to logistration.
ECOM-2947
2016-03-25 12:02:03 +05:00
Ned Batchelder
026ac6636f Update translations (autogenerated message) 2016-03-24 18:04:37 +00:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform
UITK-75
2016-03-22 15:31:27 -04:00
Andy Armstrong
e854690a99 Revert "Upgrade underscore.string.min.js."
This reverts commit e5c7fdda03.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
2016-03-22 10:44:19 -04:00
Christina Roberts
4626746678 Merge pull request #11844 from edx/christina/delete-carousel
Delete face_upload and responsive-carousel.
2016-03-21 13:26:04 -04:00
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
cahrens
e5c7fdda03 Upgrade underscore.string.min.js.
FED-68
2016-03-17 23:33:55 -04:00
cahrens
f9901614f1 Delete face_upload and responsive-carousel.
This appears to be dead code.
2016-03-17 15:14:19 -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
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
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
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
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
Peter Fogg
9188f9682c Accessibility fixes for the course home page.
ECOM-3799
2016-03-11 09:48:44 -05:00
Ned Batchelder
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00: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
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
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
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03: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
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
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
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
Chris Rodriguez
08937ce5a8 Lessening specificity for headings 2016-03-07 13:07:56 -05:00
cahrens
2eabaccb33 The escaping is unnecessary and confusing to the user. 2016-03-07 11:58:22 -05:00
Chris Rodriguez
fed1d4b455 Removing importants from heading styles 2016-03-07 10:48: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
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
Christine Lytwynec
5ef52633b6 add aria-controls to buttons and remove label from dropdown container 2016-02-26 09:02:51 -05:00
Michael Frey
860dd1bd5a Merge pull request #11651 from edx/release
Release
2016-02-24 16:15:16 -05:00