Commits · 2cdfed9efeb2e3a285ce80f700ebae053adf794b · edx / edx-platform · GitLab

08 Feb, 2013 6 commits
- Merge pull request #1472 from MITx/feature/christina/misc2 · 2cdfed9e
```
A couple minor bug fixes.
```
  Don Mitchell committed Feb 08, 2013
  2cdfed9e Browse Files
- A couple minor bug fixes. · 98026e43
```
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
```
  cahrens committed Feb 08, 2013
  98026e43 Browse Files
- Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional · 0d0049ec
```
fix test_conditional
```
  Jay Zoldak committed Feb 08, 2013
  0d0049ec Browse Files
- Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static · 72444259
```
Make it so that cms doesn't try to run collectstatic on course content
```
  chrisndodge committed Feb 08, 2013
  72444259 Browse Files
- Make it so that cms doesn't try to run collectstatic on course content · 33a3d5db
  Calen Pennington committed Feb 08, 2013
  
  33a3d5db Browse Files
- Remove generated files · dd4db060
  Calen Pennington committed Feb 08, 2013
  
  dd4db060 Browse Files
07 Feb, 2013 28 commits
- fix test_conditional · 7b7b0690
  ichuang committed Feb 07, 2013
  
  7b7b0690 Browse Files
- Merge pull request #1462 from MITx/bug/bug161 · 7f706373
```
bug 171
```
  Christina Roberts committed Feb 07, 2013
  7f706373 Browse Files
- bug 171 · 48e58264
  Don Mitchell committed Feb 07, 2013
  
  48e58264 Browse Files
- Merge pull request #1457 from MITx/feature/cale/dev-staticfiles · 095ec9d3
```
Fix loads of local static files when running in dev mode
```
  Victor Shnayder committed Feb 07, 2013
  095ec9d3 Browse Files
- Pillow needs libjpeg-dev to build JPG support. · 3ccbd504
  Ned Batchelder committed Feb 07, 2013
  
  3ccbd504 Browse Files
- Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump · 1c07fae5
```
add instructor dashboard feature to download profile & problem state
```
  David Ormsbee committed Feb 07, 2013
  1c07fae5 Browse Files
- Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain · b947b884
```
remove CSRF cookie domain setting in aws.py
```
  David Ormsbee committed Feb 07, 2013
  b947b884 Browse Files
- remove CSRF cookie domain setting in aws.py · 0394e336
  Chris Dodge committed Feb 07, 2013
  
  0394e336 Browse Files
- Merge pull request #1459 from MITx/bug/bug161 · bfb411ad
```
Put DnD back into edit_subsection page
```
  Christina Roberts committed Feb 07, 2013
  bfb411ad Browse Files
- Put DnD back into edit_subsection page · 70560d22
  Don Mitchell committed Feb 07, 2013
  
  70560d22 Browse Files
- Fix loads of local static files when running in dev mode · 2b637fe5
  Calen Pennington committed Feb 07, 2013
  
  2b637fe5 Browse Files
- add select_related("profile") · bf17341f
  ichuang committed Feb 06, 2013
  
  bf17341f Browse Files
- Merge pull request #1455 from MITx/hotfix/dave/youtube_object · a6b35853
```
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
```
  David Ormsbee committed Feb 06, 2013
  a6b35853 Browse Files
- Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. · 97677664
  David Ormsbee committed Feb 06, 2013
  
  97677664 Browse Files
- Merge pull request #1454 from MITx/hotfix/dave/youtube_object · 37b735d7
```
Hack to disable YouTube <iframe> API when they break it.
```
  Victor Shnayder committed Feb 06, 2013
  37b735d7 Browse Files
- Hack to disable YouTube <iframe> API when they break it. · a470a62d
  David Ormsbee committed Feb 06, 2013
  
  a470a62d Browse Files
- Merge pull request #1453 from MITx/victor/protex · 18ddd1ee
```
Victor/protex
```
  Victor Shnayder committed Feb 06, 2013
  18ddd1ee Browse Files
- Protex now loads correctly in every scenario · 2627a2f1
  jmclaus committed Feb 06, 2013
  
  2627a2f1 Browse Files
- Loading bug fixed by ugly hack · 98865bb7
  jmclaus committed Feb 06, 2013
  
  98865bb7 Browse Files
- GWT now does no set any target shape in onModuleLoad() · 85b92f30
  jmclaus committed Feb 06, 2013
  
  85b92f30 Browse Files
- Fixed small alighment pb, decreased font size of text box · e27b1e04
  jmclaus committed Feb 06, 2013
  
  e27b1e04 Browse Files
- Crisper AA letters, canvases non-selectable · 3bd7e1b7
  jmclaus committed Feb 06, 2013
  
  3bd7e1b7 Browse Files
- Few bug fixes · ef232c59
  jmclaus committed Feb 06, 2013
  
  ef232c59 Browse Files
- Fixed layout, increased size of markers on proteins · f6dacff4
  jmclaus committed Feb 06, 2013
  
  f6dacff4 Browse Files
- Added GWT Protex - reads target shape from xml writes answer to hidden input field · 5737f58b
  jmclaus committed Feb 06, 2013
  
  5737f58b Browse Files
- Merge pull request #1452 from MITx/silly/victor/revert-forums-merge · e4819a1b
```
Silly/victor/revert forums merge
```
  Victor Shnayder committed Feb 06, 2013
  e4819a1b Browse Files
- Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" · 2af06ef1
```
This reverts commit 66889b87, reversing
changes made to 0dd9c24e.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
```
  Victor Shnayder committed Feb 06, 2013
  2af06ef1 Browse Files
- Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" · 884a7a61
```
This reverts commit 965e3b4c, reversing
changes made to 1a7d2a06.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
```
  Victor Shnayder committed Feb 06, 2013
  884a7a61 Browse Files
06 Feb, 2013 6 commits
- Merge pull request #1432 from MITx/7012x-clean · b6ec41ca
```
7012x clean
```
  Victor Shnayder committed Feb 06, 2013
  b6ec41ca Browse Files
- add warning message to sample-post.py · 0141f31d
  Victor Shnayder committed Feb 06, 2013
  
  0141f31d Browse Files
- Merge remote-tracking branch 'origin/master' into 7012x-clean · edf96036
  Victor Shnayder committed Feb 06, 2013
  
  edf96036 Browse Files
- Merge pull request #1449 from MITx/fix/rocha/7012x-clean · 2c1f3bd4
```
Fix/rocha/7012x clean
```
  Victor Shnayder committed Feb 06, 2013
  2c1f3bd4 Browse Files
- Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes · 965e3b4c
```
addressed somme comments in pull request and instructor fixes and blank ...
```
  Victor Shnayder committed Feb 06, 2013
  965e3b4c Browse Files
- Refactor how editamolecule displays messages · 536333cb
  Carlos Andrés Rocha committed Feb 06, 2013
  
  536333cb Browse Files