Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,210 Commits 1 Branch 0 Tags
8a9845c26ee5ffac3e428da9dc8e72c8d2d413c6
Commit Graph

723 Commits

Author SHA1 Message Date
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
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00: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
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
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
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
cahrens
39dc8a5915 Perform esacaping in the templates. 
Use new best practices.
 2016-03-28 15:05:40 -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
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
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
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
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
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
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination 
Notes pagination
 2016-03-10 17:26:54 +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
cahrens
2eabaccb33 The escaping is unnecessary and confusing to the user. 2016-03-07 11:58:22 -05:00
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00: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
Ned Batchelder
d8fbdafd90 Update translations (autogenerated message) 2016-02-24 17:59:51 +00:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145) 
mathjax preview should be inline by default
 2016-02-24 12:51:30 -05:00
Ehtesham
78a61c1fb0 [TNL-4029] Show error if server returns customised error message 2016-02-24 11:05:46 +05:00
muhammad-ammar
cd01dc89a4 clear search input when search results tab is closed 
TNL-4055
 2016-02-24 11:03:16 +05:00
muhammad-ammar
ce57700d68 hide paging footer when only one page 2016-02-24 11:03:15 +05:00
muzaffaryousaf
bfa2ea5bd8 Remove sanitization from python & adding it to the templates. 
TNL-4012
 2016-02-24 11:03:15 +05:00
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend 
TNL-3908
 2016-02-24 11:03:14 +05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00