Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,979 Commits 1 Branch 0 Tags
62793ade7dcb0d10b2a5bfcffdebc9efae6186c7
Commit Graph

13714 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
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer 
PR-154 - Make it impossible to click "final check" without selecting a choice
 2016-03-30 11:33:11 -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
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
Matt Drayer
db3b2f0c97 Merge pull request #11954 from edx/mattdrayer/theme-ecommerce-url 
mattdrayer/theme-ecommerce-url: Theme support for ECOMMERCE_PUBLIC_URL_ROOT
 2016-03-30 09:41:30 -04:00
Christina Roberts
a2faef242a Merge pull request #11926 from edx/christina/course-discovery-template 
Clean up escaping in course discovery templates.
 2016-03-30 09:37:45 -04:00
J. Cliff Dyer
32729eb838 Added safety to account_settings template 2016-03-29 19:37:15 +00:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button 
Activate LMS Navigation Button across sections
 2016-03-29 15:05:59 -04:00
cahrens
bdef3bed9f Fix escaping in course discovery templates. 2016-03-29 14:28:57 -04:00
Nimisha Asthagiri
2f037f04e9 seq_module.html XSS - Safe by default 2016-03-29 12:59:15 -04:00
Nimisha Asthagiri
2c90cac962 Accessible Sequence navigation 
MA-2190
 2016-03-29 12:59:05 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections 
MA-2152
MA-2153
 2016-03-29 12:58:08 -04:00
Nimisha Asthagiri
2fc9ffd51a Merge pull request #11929 from edx/nasthagiri/css-template2 
XSS Safe templates
 2016-03-29 11:50:38 -04:00
John Eskew
7e9a139d03 Merge pull request #11766 from CredoReference/too-many-mongo-queries-in-instructor-api-gradebook 
Reduce the number of queries to mongodb in /courses/<course-id>/instructor/api/gradebook API
 2016-03-29 10:27:02 -04:00
Christina Roberts
a8f274d542 Merge pull request #11970 from edx/christina/tnl-4284 
Delete out-of-date test.
 2016-03-29 10:13:50 -04:00
Renzo Lucioni
b1f3b7d10f Merge pull request #11971 from edx/renzo/bypass-home 
Add option to bypass course home
 2016-03-29 09:12:20 -04:00
Tasawer
05898df1c1 updated dashboard with providers text 
ECOM-2935
 2016-03-29 09:26:35 +00:00
Nimisha Asthagiri
9af1aa30a9 XSS Safe Templates 2016-03-29 02:46:25 -04:00
Brian Beggs
1dff9d45f3 Merge pull request #11787 from mitocw/enhancement/aq/add_master_course_staff_in_ccx_fix_migration_issue 
Adds staff and instructor users of the master course to CCX
 2016-03-28 18:49:46 -04:00
Renzo Lucioni
6f49579166 Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-03-28 17:49:55 -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
Matt Drayer
ed0c26160b Merge pull request #11885 from edx/saleem-latif/WL-328 
WL-325: Multi-Site Comprehensive Theming
 2016-03-28 16:23:34 -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
cahrens
db3596546e Delete out-of-date test. 
TNL-4284
 2016-03-28 14:53:38 -04:00
Peter Fogg
374e97c15f Admin access for API requests. 
ECOM-3943
 2016-03-28 11:42:42 -04:00
Amir Qayyum Khan
795ead82b5 Added master course staff and admins to ccx and fixed same issues related to ccx 2016-03-26 03:18:39 +05:00
Toby Lawrence
90f41ed2cb Merge pull request #11878 from edx/PERF-279 
Use a module/path mapping for RequireJS overrides instead of just paths.
 2016-03-25 14:45:07 -04:00
Matt Drayer
000ad0a326 mattdrayer/theme-ecommerce-url: Add theme support for ECOMMERCE_PUBLIC_URL_ROOT setting 2016-03-25 11:19:15 -04:00
Andy Armstrong
e8f620a2f4 Merge pull request #11938 from edx/andya/fix-underscore-on-sandboxes 
Fix issues with Underscore in the asset pipeline
 2016-03-25 11:16:22 -04:00
Simon Chen
0ad9eb910e Merge pull request #11943 from edx/schen/FixPageTagsOnDashboardMakoTemplates 
Fix to remove mulitple page tags on mako templates
 2016-03-25 10:49:19 -04:00
Dennis Jen
f1c700a689 Merge pull request #11946 from edx/dsjen/instr-page-args 
Consolidated page tags in instructor analytics template.
 2016-03-25 10:46:20 -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
Simon Chen
d15e192b26 Fix to remove mulitple page tags on mako templates 2016-03-25 09:56:23 -04:00
Muzaffar yousaf
73c97f4d75 Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444 
Setting request timeouts for edx notes.
 2016-03-25 18:42:16 +05:00
muzaffaryousaf
1ecba9a954 Setting request timeouts for edx notes. 
TNL-2444
 2016-03-25 16:26:35 +05:00
Michael Katz
9ea37a642b Merge pull request #11888 from edx/mkatz/safetemplate 
safe template
 2016-03-25 06:48:31 -04:00
Douglas Hall
62ce357b81 Merge pull request #11905 from edx/douglashall/xss_bug_bash 
XSS Bug Bash
 2016-03-25 05:38:59 -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
Douglas Hall
f177cb6e3e Make templates safe 2016-03-24 20:52:07 -04:00
Dennis Jen
89f11638ad Consolidated page tags in instructor analytics template. 2016-03-24 17:06:40 -04:00
Dennis Jen
33bff3b244 Merge pull request #11897 from edx/dsjen/instructor-dash-enrollment-safe-temp 
Added safe templating to instructor_analytics.html.
 2016-03-24 15:36:39 -04:00
Ned Batchelder
8703affe59 Merge pull request #11940 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-24 15:06:35 -04:00
Ned Batchelder
026ac6636f Update translations (autogenerated message) 2016-03-24 18:04:37 +00:00
Kevin Falcone
93dc905081 Merge pull request #11913 from edx/jibsheet/submission-history-time-zone 
This appears to actually be in UTC (not in the django TZ default).
 2016-03-24 14:01:24 -04:00
Toby Lawrence
5758a82665 Syntax error. 2016-03-24 11:44:01 -04:00
Toby Lawrence
2a87d6c8a5 Add straggler JS files to RequireJS overrides. 2016-03-24 11:35:48 -04:00
sanfordstudent
5ec01207be Merge pull request #11924 from edx/sstudent/safe_video_template 
Sstudent/safe video template
 2016-03-24 10:10:30 -04:00
sanfordstudent
4a496e7db4 Merge pull request #11921 from edx/sstudent/safe_welcome_back 
making the welcome_back template safe
 2016-03-24 10:10:21 -04:00