Commit Graph

5315 Commits

Author SHA1 Message Date
tasawernawaz
e962a39ef7 Revert "ECOM-3201"
This reverts commit 628843f62c.
2016-04-14 14:23:41 +00:00
Tasawer
628843f62c ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-14 10:48:21 +00:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui
API request page improvements.
2016-04-12 15:58:49 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI.
ECOM-4024
2016-04-12 14:05:31 -04:00
Bound3R
4ddcf31ad8 change css properties for mixins bi-aap in about template
remove unnecessary parentheses

change css properties for mixins bi-aap in login/register page

change css properties for mixins bi-app in about course page

change css properties for mixins bi-app in the dashboard

change css properties for mixins bi-app in help template

change css properties for mixins bi-app in the home page

change css properties for mixins bi-app in jobs, press and media pages

remove the extra spaces
2016-04-12 12:59:53 -05:00
Peter Fogg
7864ec1c2c Merge pull request #12109 from edx/peter-fogg/course-home-a11y-test
Add a11y test for the course home page.
2016-04-12 10:04:28 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
2016-04-12 08:22:14 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Andy Armstrong
fd3a87a2cf Merge pull request #12102 from edx/andya/pattern-library-test-page-take-2
Introduce Pattern Library test pages (take two)
2016-04-11 10:28:25 -04:00
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 11:41:04 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Simon Chen
b5b7ea7884 Create the listing page of Programs (x-series) which learners have enrolled in 2016-04-05 10:10:19 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request
Request API access.
2016-04-04 22:56:49 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API.
ECOM-3940
2016-04-04 20:29:19 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string
FEDX-117
2016-04-04 10:18:43 -04:00
Jacek Bzdak
09f5277f3b Some tests for badges js 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
1a6394b781 Add share modal to badge listing. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Awais Jibran
75b8eae964 Merge pull request #11973 from edx/aj/ecom-3910-certification-exception-not-loading
Fix certificate exception view.
2016-04-01 14:48:36 +05:00
Omar Khan
453ae3e7e5 Add azuread SSO button style 2016-04-01 08:58:00 +07:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons
- Icon images can be uploaded from the django admin
- Test coverage improved
2016-04-01 08:57:43 +07:00
Renzo Lucioni
dc25ece02a Merge pull request #11879 from edx/schen/ECOM-3194
ECOM-3194 Create the listing page of Programs (x-series) which learners have enrolled in
2016-03-31 16:35:54 -04:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Eric Fischer
59ab5d2a62 Merge pull request #11886 from edx/efischer/make_edx_safe_again
Verify student template safety
2016-03-31 14:49:42 -04:00
Ned Batchelder
38a9ace7bf Update translations (autogenerated message) 2016-03-30 19:35:49 +00:00
Eric Fischer
7077c933a4 Make verify_student templates safe
Fixes safe_template_linter errors for everything under verify_student. Includes
fixes to Jasmine tests and usage of HtmlUtils functionality.
2016-03-30 13:47:42 -04:00
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
Awais Jibran
9b19ab05e5 Fix certificate exception view.
ECOM-3910
2016-03-29 15:59:13 +05: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