Commits · 32ab555080ff01f2e2f58222ab976bbe971ab52c · edx / edx-platform

27 Mar, 2016 1 commit
- Merge pull request #9095 from solashirai/sola/feature_csh · 32ab5550
```
(WIP) Crowdsource Hinter Prototype
```
  Ned Batchelder committed Mar 27, 2016
  32ab5550 Browse Files
26 Mar, 2016 17 commits
- changed entry in github.txt · 82936a0f
  solashirai committed Mar 26, 2016
  
  82936a0f Browse Files
- removed incorrect check · dbd0c56a
  solashirai committed Mar 26, 2016
  
  dbd0c56a Browse Files
- fixed import path for crowdsourcehinter page · 004d6019
  solashirai committed Mar 26, 2016
  
  004d6019 Browse Files
- moved bokchoy tests · 0dcddf1e
  solashirai committed Mar 26, 2016
  
  0dcddf1e Browse Files
- removed unused context_selector · fc5ccbfb
  solashirai committed Mar 26, 2016
  
  fc5ccbfb Browse Files
- quality fixes · d3115f3c
  solashirai committed Mar 26, 2016
  
  d3115f3c Browse Files
- quality fixes · d59b5fb8
  solashirai committed Mar 26, 2016
  
  d59b5fb8 Browse Files
- added __init__.py · 436cebde
  solashirai committed Mar 26, 2016
  
  436cebde Browse Files
- quality fixes · 51216748
  solashirai committed Mar 26, 2016
  
  51216748 Browse Files
- removed accidental addition of unneeded file · 9dd604ee
  solashirai committed Mar 26, 2016
  
  9dd604ee Browse Files
- modified to resemble test_recommender · 38752a77
  solashirai committed Mar 26, 2016
  
  38752a77 Browse Files
- added method to skip test unless testing in lms · fdae162b
  solashirai committed Mar 26, 2016
  
  fdae162b Browse Files
- Added basic docstrings · b7b1d43e
  solashirai committed Mar 26, 2016
  
  b7b1d43e Browse Files
- Fixes for imports · da6e3e23
  Piotr Mitros committed Mar 26, 2016
  
  da6e3e23 Browse Files
- added crowdsourcehinter · 05265501
  solashirai committed Mar 26, 2016
  
  05265501 Browse Files
- added Sola Shirai · 92514c80
  solashirai committed Mar 26, 2016
  
  92514c80 Browse Files
- Merge pull request #11950 from open-craft/omar/reset-test-db · 161b8f94
```
Fail fast if the reset-test-db script fails
```
  Ben Patterson committed Mar 26, 2016
  161b8f94 Browse Files
25 Mar, 2016 21 commits
- Merge pull request #11956 from edx/ned/flaky-test · 9fc55265
```
Flaky test, recorded as TNL-4302
```
  Ned Batchelder committed Mar 25, 2016
  9fc55265 Browse Files
- Merge pull request #11878 from edx/PERF-279 · 90f41ed2
```
Use a module/path mapping for RequireJS overrides instead of just paths.
```
  Toby Lawrence committed Mar 25, 2016
  90f41ed2 Browse Files
- Merge pull request #11828 from edx/muddasser/cms/textbooks · a0b63d39
```
Partially covered in bokchoy at lms/test_lms.py:PDFTextBooksTabTest
```
  Muddasser committed Mar 25, 2016
  a0b63d39 Browse Files
- Flaky test, recorded as TNL-4302 · 3a5cacf1
  Ned Batchelder committed Mar 25, 2016
  
  3a5cacf1 Browse Files
- Revert "Only require a module once." · 1af28cef
```
This reverts commit 76c0c041.
```
  Toby Lawrence committed Mar 25, 2016
  1af28cef Browse Files
- Merge pull request #11945 from edx/robrap/linter · 801bb288
```
Add check for multiple page tags
```
  Robert Raposa committed Mar 25, 2016
  801bb288 Browse Files
- Merge pull request #11952 from edx/douglashall/PHX-255/update_lti_consumer_1_0_4 · 6bbcbbf0
```
Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes
```
  Douglas Hall committed Mar 25, 2016
  6bbcbbf0 Browse Files
- Merge pull request #11938 from edx/andya/fix-underscore-on-sandboxes · e8f620a2
```
Fix issues with Underscore in the asset pipeline
```
  Andy Armstrong committed Mar 25, 2016
  e8f620a2 Browse Files
- Merge pull request #11943 from edx/schen/FixPageTagsOnDashboardMakoTemplates · 0ad9eb91
```
Fix to remove mulitple page tags on mako templates
```
  Simon Chen committed Mar 25, 2016
  0ad9eb91 Browse Files
- Merge pull request #11946 from edx/dsjen/instr-page-args · f1c700a6
```
Consolidated page tags in instructor analytics template.
```
  Dennis Jen committed Mar 25, 2016
  f1c700a6 Browse Files
- Fix issues with Underscore in the asset pipeline · 6dd09a89
```
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.
```
  Andy Armstrong committed Mar 25, 2016
  6dd09a89 Browse Files
- Fix to remove mulitple page tags on mako templates · d15e192b
  Simon Chen committed Mar 25, 2016
  
  d15e192b Browse Files
- Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444 · 73c97f4d
```
Setting request timeouts for edx notes.
```
  Muzaffar yousaf committed Mar 25, 2016
  73c97f4d Browse Files
- Upgrade xblock-lti-consumer to 1.0.4 to pull in bug fixes · fb6f3ca5
  Douglas Hall committed Mar 25, 2016
  
  fb6f3ca5 Browse Files
- Fail fast if the reset-test-db script fails · 78101314
  Omar Khan committed Mar 25, 2016
  
  78101314 Browse Files
- Setting request timeouts for edx notes. · 1ecba9a9
```
TNL-2444
```
  muzaffaryousaf committed Mar 25, 2016
  1ecba9a9 Browse Files
- Merge pull request #11888 from edx/mkatz/safetemplate · 9ea37a64
```
safe template
```
  Michael Katz committed Mar 25, 2016
  9ea37a64 Browse Files
- Merge pull request #11905 from edx/douglashall/xss_bug_bash · 62ce357b
```
XSS Bug Bash
```
  Douglas Hall committed Mar 25, 2016
  62ce357b Browse Files
- Merge pull request #11827 from… · 402ca836
```
Merge pull request #11827 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration

Fixed the other half of forgot password flow accourding to logistration.
```
  Waheed Ahmed committed Mar 25, 2016
  402ca836 Browse Files
- Fixed the other half of forgot password flow accourding to logistration. · 4399a5c7
```
ECOM-2947
```
  Waheed Ahmed committed Mar 25, 2016
  4399a5c7 Browse Files
- Make templates safe · f177cb6e
  Douglas Hall committed Mar 24, 2016
  
  f177cb6e Browse Files
24 Mar, 2016 1 commit
- Consolidated page tags in instructor analytics template. · 89f11638
  Dennis Jen committed Mar 24, 2016
  
  89f11638 Browse Files