Commits · a470a62d12bb3d4e74dcfd92717459f19b581088 · Hsin-Yu Chien / edx-platform-release

Feb 07, 2013
- Hack to disable YouTube <iframe> API when they break it. · a470a62d
  David Ormsbee authored 12 years ago
  
  a470a62d
Feb 06, 2013
- Throw the error back up if we don't have a console to log it to. · e5fda33e
  David Ormsbee authored 12 years ago
  
  e5fda33e
- Merge pull request #1446 from MITx/fix/vik/peer-grading-images · bbf37ef9
  Diana Huang authored 12 years ago
  
  Fix/vik/peer grading images
  bbf37ef9
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · 463f3161
  Vik Paruchuri authored 12 years ago
  
  463f3161
- Merge pull request #1439 from MITx/feature/vik/oe-versioning · c68b0d3c
  VikParuchuri authored 12 years ago
  
  Feature/vik/oe versioning
  c68b0d3c
- Add in close date to metadata · cf81fb27
  Vik Paruchuri authored 12 years ago
  
  cf81fb27
- Fix git issue · 733faeba
  Vik Paruchuri authored 12 years ago
  
  733faeba
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 5a51d142
  Vik Paruchuri authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
  5a51d142
- Fix oe version tests · f568e492
  Vik Paruchuri authored 12 years ago
  
  f568e492
- Merge pull request #1440 from MITx/diana/rubric-ui-improvements · f42f84d9
  Diana Huang authored 12 years ago
  
  Rubric UI updates
  f42f84d9
- Merge pull request #1428 from MITx/feature/diana/close-oe-problems · 62dcd09b
  VikParuchuri authored 12 years ago
  
  Close OE Problems
  62dcd09b
- Merge branch 'master' into feature/diana/close-oe-problems · f3fa4380
  Diana Huang authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/tests/test_combined_open_ended.py common/lib/xmodule/xmodule/tests/test_self_assessment.py common/lib/xmodule/xmodule/timeparse.py
  f3fa4380
- Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images · f565d17b
  Vik Paruchuri authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
  f565d17b
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · a0febd35
  Vik Paruchuri authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
  a0febd35
- Try to fix tests · ddda9ba5
  Vik Paruchuri authored 12 years ago
  
  ddda9ba5
- Merge branch 'master' into diana/rubric-ui-improvements · 4adf2f61
  Diana Huang authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/combined_open_ended_rubric.py
  4adf2f61
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 96636681
  Vik Paruchuri authored 12 years ago
  
  Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
  96636681
- Merge branch 'master' into diana/rubric-ui-improvements · 1f5beba3
  Diana Huang authored 12 years ago
  
  1f5beba3
- Merge pull request #1429 from MITx/feature/cale/pep8-autofix · 53312713
  Ned Batchelder authored 12 years ago
  
  Feature/cale/pep8 autofix
  53312713
- Pep8 autofixes · cfae1cdf
  Calen Pennington authored 12 years ago
  
  cfae1cdf
- Make pylint work on bare .py files from rake · 7fc40814
  Calen Pennington authored 12 years ago
  
  7fc40814
- Config changes to make pep8 autofixes easier · 0b650122
  Calen Pennington authored 12 years ago
  
  0b650122
- Merge pull request #1415 from MITx/feature/zoldak/cms-unit-tests · e89948a5
  Calen Pennington authored 12 years ago
  
  Use timestamp in collection name for modulestore tests
  e89948a5
- Improve docstring wording for ModuleStoreTestCase class. · 72023cb5
  Jay Zoldak authored 12 years ago
  
  72023cb5
- Move modulestore unique naming in tests from the settings.py file into the... · abf4ad36
  Jay Zoldak authored 12 years ago
  
  Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.
  abf4ad36
- Refactor tests for cms contentstore. · fde6d1ba
  Jay Zoldak authored 12 years ago
  
  fde6d1ba
- Reorganize test cases · 33246152
  Jay Zoldak authored 12 years ago
  
  33246152
- Reorganize the CmsTestCase subclass · 5a6b0392
  Jay Zoldak authored 12 years ago
  
  5a6b0392
- Rearrange factories and clean up imports · 2c5a7ccd
  Jay Zoldak authored 12 years ago
  
  2c5a7ccd
- Remove toy dbs from CMS test settings.py file as they are not used. · b329b0ea
  Jay Zoldak authored 12 years ago
  
  b329b0ea
- Change modulestore name and subclass TestCase · b63c3c5a
  Jay Zoldak authored 12 years ago
  
  b63c3c5a
- Remove unneeded error type. · f9304a88
  Diana Huang authored 12 years ago
  
  f9304a88
- Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule · 95d39573
  Diana Huang authored 12 years ago
  
  Patch peer grading tab to work
  95d39573
- Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph · 92f2149d
  David Ormsbee authored 12 years ago
  
  Allow policy.json to disable progress graph
  92f2149d
- add doc about disable_progress_graph · 6a7e30e3
  ichuang authored 12 years ago
  
  6a7e30e3
- add disable_progress_graph key to course metadata · 0936f448
  ichuang authored 12 years ago
  
  0936f448
- Fix combined open ended tests · 94e6346c
  Vik Paruchuri authored 12 years ago
  
  94e6346c
- Fix descriptor creation · a1e73392
  Vik Paruchuri authored 12 years ago
  
  a1e73392
Feb 05, 2013
- Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes · 6b468df5
  Victor Shnayder authored 12 years ago
  
  Revert "Fix permissions bug and add test cases for django comment client...
  6b468df5
- Fix combined open ended tests · 0fc50095
  Vik Paruchuri authored 12 years ago
  
  0fc50095