Commits · e27b1e04a7ee325d0df45f672d0aeb5246373c27 · edx / edx-platform · GitLab

07 Feb, 2013 5 commits
- 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
06 Feb, 2013 35 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
- addressed somme comments in pull request and instructor fixes and blank group fix · 1dd0ef27
  Kevin Chugh committed Feb 06, 2013
  
  1dd0ef27 Browse Files
- Merge pull request #1442 from MITx/marketing/reg-tweak · 1a7d2a06
```
Fix placeholder email in signup form
```
  Victor Shnayder committed Feb 06, 2013
  1a7d2a06 Browse Files
- Merge pull request #1448 from MITx/feature/ichuang/conditional-xmodule-icon-and-errortracker · 4b54e849
```
Conditional XModule: add errortracker msg for bad require & inherit icon from child
```
  Victor Shnayder committed Feb 06, 2013
  4b54e849 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into… · b5ba88f0
```
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker

Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
```
  ichuang committed Feb 06, 2013
  b5ba88f0 Browse Files
- conditional xmod: add errortracker msg and inherit icon from child · c16f6888
  ichuang committed Feb 06, 2013
  
  c16f6888 Browse Files
- Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes · 66889b87
```
Feature/kevin/groups ui changes
```
  Victor Shnayder committed Feb 06, 2013
  66889b87 Browse Files
- Modify editamolecule to load GWT scripts dynamically · d4afa02b
  Carlos Andrés Rocha committed Feb 06, 2013
  
  d4afa02b Browse Files
- Merge pull request #1447 from MITx/debug/dave/pearson_js_error · 0dd9c24e
```
Throw the error back up if we don't have a console to log it to.
```
  Victor Shnayder committed Feb 06, 2013
  0dd9c24e Browse Files
- merged master · 55c205b9
  Kevin Chugh committed Feb 06, 2013
  
  55c205b9 Browse Files
- Throw the error back up if we don't have a console to log it to. · e5fda33e
  David Ormsbee committed Feb 06, 2013
  
  e5fda33e Browse Files
- Merge pull request #1444 from MITx/feature/cale/dev-staticfiles · 92eb88d4
```
Make local dev work by trying checking staticfiles_storage for both the ...
```
  Victor Shnayder committed Feb 06, 2013
  92eb88d4 Browse Files
- Merge pull request #1446 from MITx/fix/vik/peer-grading-images · bbf37ef9
```
Fix/vik/peer grading images
```
  Diana Huang committed Feb 06, 2013
  bbf37ef9 Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · 463f3161
  Vik Paruchuri committed Feb 06, 2013
  
  463f3161 Browse Files
- Merge pull request #1439 from MITx/feature/vik/oe-versioning · c68b0d3c
```
Feature/vik/oe versioning
```
  VikParuchuri committed Feb 06, 2013
  c68b0d3c Browse Files
- Add in close date to metadata · cf81fb27
  Vik Paruchuri committed Feb 06, 2013
  
  cf81fb27 Browse Files
- Fix git issue · 733faeba
  Vik Paruchuri committed Feb 06, 2013
  
  733faeba Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 5a51d142
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
```
  Vik Paruchuri committed Feb 06, 2013
  5a51d142 Browse Files
- Fix oe version tests · f568e492
  Vik Paruchuri committed Feb 06, 2013
  
  f568e492 Browse Files
- Merge pull request #1440 from MITx/diana/rubric-ui-improvements · f42f84d9
```
Rubric UI updates
```
  Diana Huang committed Feb 06, 2013
  f42f84d9 Browse Files
- Merge pull request #1428 from MITx/feature/diana/close-oe-problems · 62dcd09b
```
Close OE Problems
```
  VikParuchuri committed Feb 06, 2013
  62dcd09b Browse Files
- Merge branch 'master' into feature/diana/close-oe-problems · f3fa4380
```
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
```
  Diana Huang committed Feb 06, 2013
  f3fa4380 Browse Files
- Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images · f565d17b
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  f565d17b Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · a0febd35
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  a0febd35 Browse Files
- Try to fix tests · ddda9ba5
  Vik Paruchuri committed Feb 06, 2013
  
  ddda9ba5 Browse Files
- Merge branch 'master' into diana/rubric-ui-improvements · 4adf2f61
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
```
  Diana Huang committed Feb 06, 2013
  4adf2f61 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 96636681
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  96636681 Browse Files
- Merge branch 'master' into diana/rubric-ui-improvements · 1f5beba3
  Diana Huang committed Feb 06, 2013
  
  1f5beba3 Browse Files
- minor tweaks after testing · 6b4a1dfd
  Your Name committed Feb 06, 2013
  
  6b4a1dfd Browse Files
- Merge pull request #1429 from MITx/feature/cale/pep8-autofix · 53312713
```
Feature/cale/pep8 autofix
```
  Ned Batchelder committed Feb 06, 2013
  53312713 Browse Files