Commits · 851ed6722a47c2dc019a04810bcfbf164a5e10a4 · edx / edx-platform

28 May, 2013 3 commits

Continue merge. · 851ed672
cahrens committed May 27, 2013

851ed672 Browse Files

Merge branch 'master' into feature/christina/metadata-ui · 34082efa

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

committed May 27, 2013

34082efa Browse Files

Merge branch 'master' into feature/christina/metadata-ui · 17c710af

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

committed May 27, 2013

17c710af Browse Files

27 May, 2013 1 commit
- Move includes to right place. · 599a215a
  cahrens committed May 27, 2013
  
  599a215a Browse Files
24 May, 2013 15 commits
- Merge pull request #2085 from edx/feature/vik/oe-editor · 256a3677
```
Feature/vik/oe editor
```
  VikParuchuri committed May 24, 2013
  256a3677 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor · b1b93e71
  Vik Paruchuri committed May 24, 2013
  
  b1b93e71 Browse Files
- Fix some pep8 stuff · e17276ad
  Vik Paruchuri committed May 24, 2013
  
  e17276ad Browse Files
- Swap icon to icon-table · cef401f2
  Vik Paruchuri committed May 24, 2013
  
  cef401f2 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 87d904cb
```
Conflicts:
	cms/templates/base.html
```
  cahrens committed May 24, 2013
  87d904cb Browse Files
- Merge pull request #2117 from edx/fix/will/testing-docs · 519ddc02
```
Updated testing documentation to reflect changes to how requirements are
```
  Will Daly committed May 24, 2013
  519ddc02 Browse Files
- Swap icons for font awesome · 9cbb4e09
  Vik Paruchuri committed May 24, 2013
  
  9cbb4e09 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor · 5050eab7
  Vik Paruchuri committed May 24, 2013
  
  5050eab7 Browse Files
- Removed obsolete troubleshooting tip. · a64476f3
  Will Daly committed May 24, 2013
  
  a64476f3 Browse Files
- Merge pull request #2118 from edx/fix/frances/studio-iconcleanup · d2880586
```
Removed old icon references and files
```
  frances botsford committed May 24, 2013
  d2880586 Browse Files
- Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui · c0aef206
  marco committed May 24, 2013
  
  c0aef206 Browse Files
- Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes · 27c6816b
```
randomize_module.py was missing 'import lxml' to support definition_to_x...
```
  chrisndodge committed May 24, 2013
  27c6816b Browse Files
- removed old icon css and js files and references that are no longer needed · dfb623a2
  Frances Botsford committed May 24, 2013
  
  dfb623a2 Browse Files
- converted undo image in component settings list to FontAwesome · 8b76afb9
  Frances Botsford committed May 24, 2013
  
  8b76afb9 Browse Files
- Updated testing documentation to reflect changes to how requirements are · bfaadd47
```
installed.
```
  Will Daly committed May 23, 2013
  bfaadd47 Browse Files
23 May, 2013 21 commits
- Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install · ebc991cc
```
Put numpy into a pre.txt so that everything will actually install.
```
  Ned Batchelder committed May 23, 2013
  ebc991cc Browse Files
- randomize_module.py was missing 'import lxml' to support definition_to_xml().… · b6090952
```
randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool
```
  Chris Dodge committed May 23, 2013
  b6090952 Browse Files
- Merge pull request #2112 from edx/feature/giulio/variablize-colors · 94300608
```
fixing video-bg-image and homepage-bg-image urls
```
  caesar2164 committed May 23, 2013
  94300608 Browse Files
- Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports · 69beea85
```
Record junit reports of jasmine tests
```
  Calen Pennington committed May 23, 2013
  69beea85 Browse Files
- fixing video-bg-image and homepage-bg-image urls · 538ffe6f
  Giulio Gratta committed May 23, 2013
  
  538ffe6f Browse Files
- revises alignment of advanced editor and cheatsheet toggle · 1371c8d0
  Brian Talbot committed May 23, 2013
  
  1371c8d0 Browse Files
- studio - adjusts visual vertical spacing of save/cancel actions in modal editing… · 7940ca54
```
studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits.
```
  Brian Talbot committed May 23, 2013
  7940ca54 Browse Files
- Merge pull request #2110 from edx/fix/db/lettuce-tests · 007a4e53
```
Fix lettuce tests
```
  David Baumgold committed May 23, 2013
  007a4e53 Browse Files
- Fix lettuce tests · cf1e906c
  David Baumgold committed May 23, 2013
  
  cf1e906c Browse Files
- Merge pull request #2050 from edx/feature/giulio/variablize-colors · ba93f453
```
first round of color replacements with variables
```
  caesar2164 committed May 23, 2013
  ba93f453 Browse Files
- fix bad css and clean up after rebase/merge · 566a8b38
  Giulio Gratta committed May 23, 2013
  
  566a8b38 Browse Files
- fixed hardcoded changes left over from parent theme branch backport · 93258c54
  Giulio Gratta committed May 23, 2013
  
  93258c54 Browse Files
- first round of color replacements with variables · 3dd5733c
  Giulio Gratta committed May 23, 2013
  
  3dd5733c Browse Files
- Will not do unrelated test at this time. · 1a8a7219
  cahrens committed May 23, 2013
  
  1a8a7219 Browse Files
- Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master · a8084628
```
Feature/cdodge/autoprovision forums master
```
  chrisndodge committed May 23, 2013
  a8084628 Browse Files
- Merge pull request #2090 from edx/fix/cale/amazon-ses-errors · 257dae63
```
Fix/cale/amazon ses errors
```
  Calen Pennington committed May 23, 2013
  257dae63 Browse Files
- Merge pull request #2109 from edx/ned/hotfix-disable-codejail-memory-limit · 9e542aa5
```
Use the latest CodeJail, with 0 default for memory limit.
```
  Ned Batchelder committed May 23, 2013
  9e542aa5 Browse Files
- Removed references to server_error.js · 082e24c6
  David Baumgold committed May 23, 2013
  
  082e24c6 Browse Files
- Use the latest CodeJail, with 0 default for memory limit. · 1224204b
  Ned Batchelder committed May 23, 2013
  
  1224204b Browse Files
- Merge. · 48703af2
  cahrens committed May 23, 2013
  
  48703af2 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · c95b44d8
```
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  cahrens committed May 23, 2013
  c95b44d8 Browse Files