Commits · 8b0c30e69f1955d6196346a259ef08f6e50dca66 · edx / edx-platform · GitLab

07 Mar, 2013 2 commits
- Fixed small typo. · 8b0c30e6
  Valera Rozuvan committed Mar 07, 2013
  
  8b0c30e6 Browse Files
- remove getting of descriptor. location isn't defined here so it blows up.… · 75872e1d
```
remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch...
```
  Chris Dodge committed Mar 06, 2013
  75872e1d Browse Files
06 Mar, 2013 25 commits
- Append course modules to list of courses during import · 094b1897
  Calen Pennington committed Mar 06, 2013
  
  094b1897 Browse Files
- Remove references to .definition and .metadata in modules · cec3475c
  Calen Pennington committed Mar 06, 2013
  
  cec3475c Browse Files
- Remove old cms templates · af3c92c4
  Calen Pennington committed Mar 06, 2013
  
  af3c92c4 Browse Files
- Fix inaccurate instructions around import · ba69392f
  Calen Pennington committed Mar 06, 2013
  
  ba69392f Browse Files
- Fix how the 'empty' field is excluded from html_module editable fields · 5222c61d
  Calen Pennington committed Mar 06, 2013
  
  5222c61d Browse Files
- If we can't parse policy, then set it to an empty dictionary · 4327aa18
  Calen Pennington committed Mar 06, 2013
  
  4327aa18 Browse Files
- Clean up how grading policy is set · 4cbae226
  Calen Pennington committed Mar 06, 2013
  
  4cbae226 Browse Files
- Remove the 'title' alias for lms.display_name · e7900859
  Calen Pennington committed Mar 06, 2013
  
  e7900859 Browse Files
- Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged · 3b7a589e
  Calen Pennington committed Mar 06, 2013
  
  3b7a589e Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · aa026387
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  aa026387 Browse Files
- fix `test_conditional`, add new conditional to "conditional_and_poll" test course · 493421c1
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  493421c1 Browse Files
- Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes · 7871fce7
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
```
  Vik Paruchuri committed Mar 06, 2013
  7871fce7 Browse Files
- Remove 2 more debug statements · b75b0915
  Vik Paruchuri committed Mar 06, 2013
  
  b75b0915 Browse Files
- Remove debug statements · c1218e8c
  Vik Paruchuri committed Mar 06, 2013
  
  c1218e8c Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 8a9ba79d
```
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
```
  Calen Pennington committed Mar 06, 2013
  8a9ba79d Browse Files
- Generate less db inserts · f73979d0
  Vik Paruchuri committed Mar 06, 2013
  
  f73979d0 Browse Files
- Fix peer grading boolean parsing · d20fc439
  Vik Paruchuri committed Mar 06, 2013
  
  d20fc439 Browse Files
- Force instance state to save periodically · 3329af07
  Vik Paruchuri committed Mar 06, 2013
  
  3329af07 Browse Files
- Caching attribute values from child module · 7ea3d70c
  Vik Paruchuri committed Mar 06, 2013
  
  7ea3d70c Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · 3270caed
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  3270caed Browse Files
- fix test_logic · 06001c8c
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  06001c8c Browse Files
- Reorderd xmodule storage migrations · 14873e64
  Calen Pennington committed Mar 06, 2013
  
  14873e64 Browse Files
- fix dnd tests · bb69e9fa
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  bb69e9fa Browse Files
- fix self.excess_draggables · f71c43f7
  Vasyl Nakvasiuk committed Mar 06, 2013
  
  f71c43f7 Browse Files
- Mostly working state · b7c6f7ca
  Vik Paruchuri committed Mar 05, 2013
  
  b7c6f7ca Browse Files
05 Mar, 2013 13 commits
- Convert to passing in current task state again · 0d777a7a
  Vik Paruchuri committed Mar 05, 2013
  
  0d777a7a Browse Files
- starting pdfbook doc · cde4cdf8
  Brian Wilson committed Mar 05, 2013
  
  cde4cdf8 Browse Files
- Combined open ended renders correctly, but internal state tracking broken · 904ed6c8
  Vik Paruchuri committed Mar 05, 2013
  
  904ed6c8 Browse Files
- Switch to passing through entire task state · 697e426c
  Vik Paruchuri committed Mar 05, 2013
  
  697e426c Browse Files
- Merge pull request #1581 from MITx/feature/vik/advanced-studio · e093431d
```
Feature/vik/advanced studio
```
  Christina Roberts committed Mar 05, 2013
  e093431d Browse Files
- Merge remote-tracking branch 'origin/feature/vik/fix-oe-storage' into feature/alex/poll-merged · 35551049
  Calen Pennington committed Mar 05, 2013
  
  35551049 Browse Files
- Fix tests except for conditional module and open ended grading · b7680f31
  Calen Pennington committed Mar 05, 2013
  
  b7680f31 Browse Files
- Remove string and old import · 102c594e
  Vik Paruchuri committed Mar 05, 2013
  
  102c594e Browse Files
- Address review comments · 9475c6ed
  Vik Paruchuri committed Mar 05, 2013
  
  9475c6ed Browse Files
- Advanced modules must now be specified individually in order to enable them on… · 5bbb70ef
```
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
```
  Arthur Barrett committed Mar 05, 2013
  5bbb70ef Browse Files
- Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all · d7484c5e
```
removed un-enroll all button for fear of disaster
```
  Victor Shnayder committed Mar 05, 2013
  d7484c5e Browse Files
- Merge pull request #1599 from MITx/feature/deena/testing · a018b8ac
```
Feature/deena/testing
```
  Will Daly committed Mar 05, 2013
  a018b8ac Browse Files
- Pep8 fixes for tests · b0a01819
  Jay Zoldak committed Mar 05, 2013
  
  b0a01819 Browse Files