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

35979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
62793ade7d Merge pull request #11979 from edx/robrap/linter 
TNL-4214/TNL-4287: Enhance safe template linter
 2016-03-30 15:13:31 -04:00
Robert Raposa
916723fcaa Enhance safe template linter 
- Check includes for Mako templates
- Check display_name_with_default_escaped uses
- Add exceptions for Underscore and <%=
- Skip templates that are Django and not Mako
- Add pragma to disable errors
- Enhance unit tests
- Remove violation mako-js-string-missing-quotes
- Refactor line processing into StringLines
 2016-03-30 14:16:51 -04:00
sanfordstudent
f730936d76 Merge pull request #11937 from edx/sstudent/MA-2164-followup 
followup to MA-2164, cleaning up unused steps
 2016-03-30 13:30:55 -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
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
sanfordstudent
fd37948726 Merge pull request #11989 from edx/release 
Release
 2016-03-30 11:22:23 -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
sanfordstudent
2e2687ba05 Merge pull request #11955 from edx/rc/2016-03-29 
Release Candidate rc/2016-03-29
 2016-03-30 09:29:07 -04:00
Carol Tong
84e88ebaaa Merge pull request #11969 from edx/carol/DOC-2216 
DOC-2216: Modify message text when Adv Settings saved
 2016-03-29 17:11:55 -04:00
Carol Tong
9b128695d6 Merge pull request #11944 from edx/carol/DOC-2533 
DOC-2533: Update help text on Assignment Types page
 2016-03-29 16:33:47 -04:00
Carol Tong
a33e703910 Modify message text when Adv Settings saved 2016-03-29 16:12:00 -04:00
Carol Tong
4ab75c7c00 Update help text on Grading Assignment Types page 2016-03-29 15:39:24 -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
Christina Roberts
dab77fda41 Merge pull request #11976 from edx/christina/update-bok-choy 
Update Bok Choy to 0.5.1 release.
 2016-03-29 14:07:14 -04:00
Sanford Student
a8c77f8d78 followup to MA-2164, cleaning up unused steps 2016-03-29 13:46:52 -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
Calen Pennington
37813d1820 Merge pull request #11958 from cpennington/cale/xss 
Make (some) Mako templates HTML escaped by default
 2016-03-29 11:03:31 -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
cahrens
9dcbce2155 Update Bok Choy to 0.5.1 release. 2016-03-29 10:15:05 -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
David Ormsbee
5ccb1ea025 Merge pull request #11933 from Woutifier/master 
Added random seed to metadata that is sent to external grader
 2016-03-29 09:06:21 -04:00
Calen Pennington
683151a238 XSS escape cms/templates/course-create-rerun.html 2016-03-29 08:51:22 -04:00
Calen Pennington
b81a15d57f XSS escape cms/templates/course_outline.html 2016-03-29 08:51:22 -04:00
tasawernawaz
3e3f5361bc Merge pull request #11870 from edx/tasawer/story/ecom-2935-update-dashboard-for-multi-provider 
Updated dashboard with providers text
 2016-03-29 15:43:15 +05: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
7ab6aaaa3b Merge pull request #11959 from edx/peter-fogg/request-api-access 
Admin access for API requests.
 2016-03-28 12:44:56 -04:00
Renzo Lucioni
9fe0613425 Merge pull request #11960 from edx/renzo/hide-settings 
Hide chrome and default_tab from advanced settings
 2016-03-28 12:27:12 -04:00
Ned Batchelder
bc0b4a2b52 Merge pull request #11965 from edx/ned/flaky-test-tnl-4304 
Mark as flaky, TNL-4304
 2016-03-28 11:55:39 -04:00
Peter Fogg
374e97c15f Admin access for API requests. 
ECOM-3943
 2016-03-28 11:42:42 -04:00
Brian Jacobel
3d98091324 Merge pull request #11847 from edx/bjacobel/FEDX-102-math-expression-responsive 
Fix responsiveness issue with math inputs on mobile
 2016-03-28 17:12:51 +02:00
Renzo Lucioni
3cbc03202c Hide chrome and default_tab from advanced settings 
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
 2016-03-28 10:30:46 -04:00
sanfordstudent
88d0461bfc Merge pull request #11967 from edx/sstudent/fix-typo 
fixing typo in template
 2016-03-28 09:44:03 -04:00