Commits · 0e3a022086565a57f5657c3c82f1e3e0ab1ec69d · edx / edx-platform

11 Dec, 2012 1 commit

fix broken tests from master -> CMS-master merge. Namely the change to unicode… · 0e3a0220

fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo

committed Dec 11, 2012

0e3a0220 Browse Files

07 Dec, 2012 15 commits
- Add an implementation of get_items to xml module store · b4793b32
  Calen Pennington committed Dec 07, 2012
  
  b4793b32 Browse Files
- Remove more merge badness · 47ed02c9
  Calen Pennington committed Dec 07, 2012
  
  47ed02c9 Browse Files
- Fix merge badness · 3e568667
  Calen Pennington committed Dec 07, 2012
  
  3e568667 Browse Files
- Actually run cms tests on cms master · 3b75bbdc
  Calen Pennington committed Dec 07, 2012
  
  3b75bbdc Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · c917725f
```
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
```
  Calen Pennington committed Dec 07, 2012
  c917725f Browse Files
- Merge pull request #1105 from MITx/feature/cale/github-status-api · 98fefd14
```
Feature/cale/github status api
```
  David Ormsbee committed Dec 07, 2012
  98fefd14 Browse Files
- Move files from base.sh to test.sh · 38671fc8
  Calen Pennington committed Dec 07, 2012
  
  38671fc8 Browse Files
- Move to a single test.sh file that only runs the relevant tests for a particular… · e2ed7d1c
```
Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master
```
  Calen Pennington committed Dec 07, 2012
  e2ed7d1c Browse Files
- Only mark github commit status when full test suite passes · 5a3cdc11
  Calen Pennington committed Dec 07, 2012
  
  5a3cdc11 Browse Files
- Mark failed state correctly · d4ec5946
  Calen Pennington committed Dec 07, 2012
  
  d4ec5946 Browse Files
- Change message with state · 3f518740
  Calen Pennington committed Dec 07, 2012
  
  3f518740 Browse Files
- Source jenkins/base.sh with the correct path · 86579efc
  Calen Pennington committed Dec 07, 2012
  
  86579efc Browse Files
- Source the base jenkins configuration before running tests · 724cba19
  Calen Pennington committed Dec 07, 2012
  
  724cba19 Browse Files
- Make jenkins talk to the github status api · d4cdd5b4
  Calen Pennington committed Dec 07, 2012
  
  d4cdd5b4 Browse Files
- Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs · 1a89c14b
```
Fix/cdodge/lms runtime bugs
```
  Calen Pennington committed Dec 07, 2012
  1a89c14b Browse Files
06 Dec, 2012 1 commit
- Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule · 61c17cab
```
Fix/brian/nonascii html xmodule
```
  David Ormsbee committed Dec 06, 2012
  61c17cab Browse Files
04 Dec, 2012 12 commits
- Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap · 1d9d347d
```
Don't cap points coming back from CodeResponses
```
  Victor Shnayder committed Dec 04, 2012
  1d9d347d Browse Files
- Don't cap points coming back from CodeResponses -- let them be more than… · cee0781a
```
Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit.
```
  David Ormsbee committed Dec 04, 2012
  cee0781a Browse Files
- remove skipped tests that use mongo · 70f35b2e
  Brian Wilson committed Dec 04, 2012
  
  70f35b2e Browse Files
- Merge branch 'master' into fix/brian/nonascii-html-xmodule · c2d5c04d
  Brian Wilson committed Dec 04, 2012
  
  c2d5c04d Browse Files
- cosmetic cleanup · cde20758
  Brian Wilson committed Dec 04, 2012
  
  cde20758 Browse Files
- clean up lms tests, and fix export/import · dfb99131
  Brian Wilson committed Dec 04, 2012
  
  dfb99131 Browse Files
- Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent · 94a12bdd
```
Modify Wellesley rollover logo
```
  Carlos Andrés Rocha committed Dec 04, 2012
  94a12bdd Browse Files
- Modify Wellesley rollover logo · c702bbcd
  Carlos Andrés Rocha committed Dec 04, 2012
  
  c702bbcd Browse Files
- Merge pull request #1098 from MITx/content/rocha/wellesley-announcmenent · 4f9f17d3
```
Add Wellesley College news announcement and frontpage changes
```
  Carlos Andrés Rocha committed Dec 04, 2012
  4f9f17d3 Browse Files
- Fix incorrect Facebook URL for Wellesley news announcement · 4d6162b1
  Carlos Andrés Rocha committed Dec 04, 2012
  
  4d6162b1 Browse Files
- Add Wellesley College news announcement and frontpage changes · e3d18050
  Carlos Andrés Rocha committed Dec 04, 2012
  
  e3d18050 Browse Files
- add support for utf8 in sequences, verticals and custom modules. · 4ebd70dc
  Brian Wilson committed Dec 04, 2012
  
  4ebd70dc Browse Files
03 Dec, 2012 4 commits
- add additional html tests · 5b02e1e3
  Brian Wilson committed Dec 03, 2012
  
  5b02e1e3 Browse Files
- Add more non-ascii characters to full dataset, and make fixes in xmodule code. · 1d44ebb1
  Brian Wilson committed Dec 03, 2012
  
  1d44ebb1 Browse Files
- Merge pull request #1096 from MITx/feature/cale/bad-newrelic-logging · e36cffa8
```
Don't try and send exceptions to newrelic with a busted logging interfac...
```
  Ashley Penney committed Dec 03, 2012
  e36cffa8 Browse Files
- Don't try and send exceptions to newrelic with a busted logging interface · 251f552e
  Calen Pennington committed Dec 03, 2012
  
  251f552e Browse Files
01 Dec, 2012 4 commits
- Merge pull request #1093 from MITx/bugfix/dave/pearson_compat · 36a3aeed
```
Don't log errors to console if there is no console (like IE8 and below).
```
  David Ormsbee committed Dec 01, 2012
  36a3aeed Browse Files
- Don't log errors to console if there is no console (like IE8 and below). · 3b326048
  David Ormsbee committed Dec 01, 2012
  
  3b326048 Browse Files
- Merge pull request #1092 from MITx/bugfix/dave/pearson_compat · 597b8a24
```
IE errors if you try to use 'return' as a dict key.
```
  David Ormsbee committed Dec 01, 2012
  597b8a24 Browse Files
- add toylab test data and test changes, including fix to jump_to · 0c1ebd8d
  Brian Wilson committed Nov 30, 2012
  
  0c1ebd8d Browse Files
30 Nov, 2012 3 commits
- IE errors if you try to use 'return' as a dict key. · 7ffb30d0
  David Ormsbee committed Nov 30, 2012
  
  7ffb30d0 Browse Files
- Fix MathJax S3 URL to use the standard HTTPS location · c2c016c5
  David Ormsbee committed Nov 30, 2012
  
  c2c016c5 Browse Files
- Merge pull request #1091 from MITx/hotfix/dave/ie8_mathjax · e30dceb1
```
Switch to S3 hosted mathjax (I thought we did this ages ago).
```
  Victor Shnayder committed Nov 30, 2012
  e30dceb1 Browse Files