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

35934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Ned Batchelder
9fc55265cd Merge pull request #11956 from edx/ned/flaky-test 
Flaky test, recorded as TNL-4302
 2016-03-25 14:55:42 -04: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
Muddasser
a0b63d39f9 Merge pull request #11828 from edx/muddasser/cms/textbooks 
Partially covered in bokchoy at lms/test_lms.py:PDFTextBooksTabTest
 2016-03-25 22:45:38 +05:00
Ned Batchelder
3a5cacf11d Flaky test, recorded as TNL-4302 2016-03-25 13:38:40 -04:00
Toby Lawrence
1af28cefe8 Revert "Only require a module once." 
This reverts commit 76c0c0413d.
 2016-03-25 13:22:36 -04:00
Robert Raposa
801bb288c2 Merge pull request #11945 from edx/robrap/linter 
Add check for multiple page tags
 2016-03-25 11:29:46 -04:00
Douglas Hall
6bbcbbf09d Merge pull request #11952 from edx/douglashall/PHX-255/update_lti_consumer_1_0_4 
Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes
 2016-03-25 11:19:35 -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
Douglas Hall
fb6f3ca568 Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes 2016-03-25 09:34:52 -04:00
Omar Khan
7810131457 Fail fast if the reset-test-db script fails 2016-03-25 19:04:29 +07:00
muzaffaryousaf
1ecba9a954 Setting request timeouts for edx notes. 
TNL-2444
 2016-03-25 16:26:35 +05:00