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

35958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Braden MacDonald
ee444ed67f Enable Azure AD third party auth provider by default 2016-03-29 15:24:00 -07: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
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
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
Ned Batchelder
baad8aafb7 Mark as flaky, TNL-4304 2016-03-27 11:11:19 -04:00
Ned Batchelder
32ab555080 Merge pull request #9095 from solashirai/sola/feature_csh 
(WIP) Crowdsource Hinter Prototype
 2016-03-27 11:03:47 -04:00
solashirai
82936a0f7c changed entry in github.txt 2016-03-26 18:03:34 -04:00
solashirai
dbd0c56a75 removed incorrect check 2016-03-26 18:02:33 -04:00
solashirai
004d60193f fixed import path for crowdsourcehinter page 2016-03-26 18:02:33 -04:00
solashirai
0dcddf1e57 moved bokchoy tests 2016-03-26 18:02:33 -04:00
solashirai
fc5ccbfb95 removed unused context_selector 2016-03-26 18:02:33 -04:00
solashirai
d3115f3c7d quality fixes 2016-03-26 18:02:33 -04:00
solashirai
d59b5fb87a quality fixes 2016-03-26 18:02:33 -04:00
solashirai
436cebdebc added __init__.py 2016-03-26 18:02:33 -04:00
solashirai
512167485d quality fixes 2016-03-26 18:02:33 -04:00
solashirai
9dd604ee73 removed accidental addition of unneeded file 2016-03-26 18:02:33 -04:00
solashirai
38752a777b modified to resemble test_recommender 2016-03-26 18:02:33 -04:00
solashirai
fdae162b84 added method to skip test unless testing in lms 2016-03-26 18:02:33 -04:00
solashirai
b7b1d43e0e Added basic docstrings 2016-03-26 18:02:33 -04:00
Piotr Mitros
da6e3e23a8 Fixes for imports 2016-03-26 18:02:33 -04:00
solashirai
052655016b added crowdsourcehinter 2016-03-26 18:02:33 -04:00
solashirai
92514c8094 added Sola Shirai 2016-03-26 18:02:32 -04:00
Ben Patterson
161b8f94e1 Merge pull request #11950 from open-craft/omar/reset-test-db 
Fail fast if the reset-test-db script fails
 2016-03-26 12:33:00 -04:00