Commits · e337292b5fcdec55d5576e7dd7abbc24a2ed8ae1 · edx / edx-platform · GitLab

21 Feb, 2013 6 commits
- Fix existing advanced settings lettuce tests. · e337292b
  Jay Zoldak committed Feb 21, 2013
  
  e337292b Browse Files
- Fix tip on JSON key value pairs · c10dc838
  Jay Zoldak committed Feb 21, 2013
  
  c10dc838 Browse Files
- remove console.log · e5efcf65
  Don Mitchell committed Feb 21, 2013
  
  e5efcf65 Browse Files
- remove commented out code · 851a99cb
  Don Mitchell committed Feb 21, 2013
  
  851a99cb Browse Files
- also this one · 697bd5c9
  Don Mitchell committed Feb 21, 2013
  
  697bd5c9 Browse Files
- Highlighting of field labels and smarter decision as to when to show the · 116c74c0
```
save cancel bar.
```
  Don Mitchell committed Feb 21, 2013
  116c74c0 Browse Files
20 Feb, 2013 32 commits
- Unique IDs, other cleanup. · cc63f9c2
  cahrens committed Feb 20, 2013
  
  cc63f9c2 Browse Files
- studio - notifications: made icon/copy area more bulletproof for longer lines of text · 4b850f4d
  Brian Talbot committed Feb 20, 2013
  
  4b850f4d Browse Files
- Delete unused method. · c572ba86
  cahrens committed Feb 20, 2013
  
  c572ba86 Browse Files
- Test point for formatting of JSON entry. · d9fb0673
  cahrens committed Feb 20, 2013
  
  d9fb0673 Browse Files
- Longer warning got merged out. · dd959d11
  cahrens committed Feb 20, 2013
  
  dd959d11 Browse Files
- Merge branch 'master' into feature/cas/manual-policy-merged · 7b60ec38
  Brian Talbot committed Feb 20, 2013
  
  7b60ec38 Browse Files
- studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields · e157fd26
  Brian Talbot committed Feb 20, 2013
  
  e157fd26 Browse Files
- studio - resolving local merge · ef3492aa
  Brian Talbot committed Feb 20, 2013
  
  ef3492aa Browse Files
- studio - manual policy editor: converting to new page layout and styling · c7f5b742
  Brian Talbot committed Feb 20, 2013
  
  c7f5b742 Browse Files
- Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into… · 1ccf0d48
```
Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged
```
  Jay Zoldak committed Feb 20, 2013
  1ccf0d48 Browse Files
- Update tests for the advanced policy settings feature. · 05f32f4b
```
Includes adding a method for css_click_at.
```
  Jay Zoldak committed Feb 20, 2013
  05f32f4b Browse Files
- studio - manual policy editor: converting to new page layout - WIP · ad770a5e
  Brian Talbot committed Feb 20, 2013
  
  ad770a5e Browse Files
- studio - manual policy editor: converting to new page layout - WIP · 453e249f
  Brian Talbot committed Feb 20, 2013
  
  453e249f Browse Files
- Merge pull request #1520 from MITx/feature/vik/disable-spell-check · 789db301
```
Feature/vik/disable spell check
```
  Diana Huang committed Feb 20, 2013
  789db301 Browse Files
- Comment out validation, update warning message. · 8acbeec3
  cahrens committed Feb 20, 2013
  
  8acbeec3 Browse Files
- Fix SA tests · c48998b3
  Vik Paruchuri committed Feb 20, 2013
  
  c48998b3 Browse Files
- Fix tests · 7be76fe1
  Vik Paruchuri committed Feb 20, 2013
  
  7be76fe1 Browse Files
- Merge pull request #1458 from MITx/feature/diana/close-oe-problems · 4673c739
```
Support due dates for Peer Grading XModule
```
  VikParuchuri committed Feb 20, 2013
  4673c739 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check · ee3c658f
  Vik Paruchuri committed Feb 20, 2013
  
  ee3c658f Browse Files
- Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into… · eefe8749
```
Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems
```
  Diana Huang committed Feb 20, 2013
  eefe8749 Browse Files
- Fix import statement for TimeInfo · d0bd7466
  Diana Huang committed Feb 20, 2013
  
  d0bd7466 Browse Files
- Merge branch 'master' into feature/diana/close-oe-problems · b3767fc5
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
```
  Diana Huang committed Feb 20, 2013
  b3767fc5 Browse Files
- Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule · 03a4deb8
```
Feature/vik/settings to xmodule
```
  Diana Huang committed Feb 20, 2013
  03a4deb8 Browse Files
- Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into… · cbc0406d
```
Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged
```
  cahrens committed Feb 20, 2013
  cbc0406d Browse Files
- Add number of spaces for formatting of JSON. · 305f0b2a
  cahrens committed Feb 20, 2013
  
  305f0b2a Browse Files
- Change coverage report config to reflect refactoring of terrain files · 2bde448f
  Jay Zoldak committed Feb 20, 2013
  
  2bde448f Browse Files
- Pep8fix lettuce test code · 67c2bac6
  Jay Zoldak committed Feb 20, 2013
  
  67c2bac6 Browse Files
- Remove portal (fake) app, move tests to courseware. · 562fb676
```
Comment out tests that don't run correctly without prerequisites.
```
  Jay Zoldak committed Feb 20, 2013
  562fb676 Browse Files
- Move terrain module from lms to common. · 7495bd0a
  Jay Zoldak committed Feb 20, 2013
  
  7495bd0a Browse Files
- Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome · 52caae2f
```
Adding in Studio Page headers and actions + help text
```
  Christina Roberts committed Feb 20, 2013
  52caae2f Browse Files
- Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain · 7dd1515f
```
Refactor lettuce tests to move common stuff out of lms and cms and into common
```
  Jay Zoldak committed Feb 20, 2013
  7dd1515f Browse Files
- Change coverage report config to reflect refactoring of terrain files · 30edc380
  Jay Zoldak committed Feb 20, 2013
  
  30edc380 Browse Files
19 Feb, 2013 2 commits
- made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 · 266e8951
  Brian Talbot committed Feb 19, 2013
  
  266e8951 Browse Files
- Get Save and Cancel working. · 6981ba4e
  cahrens committed Feb 19, 2013
  
  6981ba4e Browse Files