Commits · 3a2c57524fb1fd6c910cfb051273ac097dcf168f · edx / edx-platform · GitLab

15 Jan, 2013 1 commit
- Basic dnd for units · 3a2c5752
  Don Mitchell committed Jan 15, 2013
  
  3a2c5752 Browse Files
14 Jan, 2013 3 commits
- Merge pull request #1268 from MITx/feature/cas/speed-editor · c9c9f7e5
```
menu bar for heading and explanation
```
  Christina Roberts committed Jan 14, 2013
  c9c9f7e5 Browse Files
- problem editor - revised classes on editor cheatsheet text and explanation tooltip text · e82987a3
  Brian Talbot committed Jan 14, 2013
  
  e82987a3 Browse Files
- Merge pull request #1270 from MITx/bug/dhm/jan13 · fdba0e48
```
Fixed bug 114: randomized problems never right b/c state not preserved
```
  chrisndodge committed Jan 14, 2013
  fdba0e48 Browse Files
13 Jan, 2013 4 commits
- one last style tweak to problem header styling · 11656feb
  Brian Talbot committed Jan 13, 2013
  
  11656feb Browse Files
- resolved problem headers/general H1 elements floating by default in component views · 24291927
  Brian Talbot committed Jan 13, 2013
  
  24291927 Browse Files
- revised cheatsheet markdown, fixed height + added vertical scroll, and replaced… · 1cf5e10a
```
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
```
  Brian Talbot committed Jan 13, 2013
  1cf5e10a Browse Files
- added in icons for header and explanation markdown elements · 04e94473
  Brian Talbot committed Jan 13, 2013
  
  04e94473 Browse Files
11 Jan, 2013 26 commits
- Changed order of buttons to match order of cheat sheet · 1bf2cdd5
  Don Mitchell committed Jan 11, 2013
  
  1bf2cdd5 Browse Files
- Change case of Explanation to match markdown (although it's functionally · 033264b5
```
equivalent)
```
  Don Mitchell committed Jan 11, 2013
  033264b5 Browse Files
- Correct file name case (which I thought mac os would catch :-( · 06aa4a55
  Don Mitchell committed Jan 11, 2013
  
  06aa4a55 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 7d8276b6
  Don Mitchell committed Jan 11, 2013
  
  7d8276b6 Browse Files
- Fixed bug 114: randomized problems never right b/c state not preserved · 208ed0a4
```
on server
```
  Don Mitchell committed Jan 11, 2013
  208ed0a4 Browse Files
- Remove some dead css. · a4b6851e
  cahrens committed Jan 11, 2013
  
  a4b6851e Browse Files
- Merge pull request #1269 from MITx/feature/cdodge/cms-master-merge3 · 4efe5789
```
Feature/cdodge/cms master merge3
```
  chrisndodge committed Jan 11, 2013
  4efe5789 Browse Files
- Unit tests · ab7be1a6
  Don Mitchell committed Jan 11, 2013
  
  ab7be1a6 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 5920142f
  Don Mitchell committed Jan 11, 2013
  
  5920142f Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 755bf709
  Don Mitchell committed Jan 11, 2013
  
  755bf709 Browse Files
- fix up call signatures for get_parent_locations() · 9479ef3c
  Chris Dodge committed Jan 11, 2013
  
  9479ef3c Browse Files
- studio - tweaking problem editor's advanced editor toggle control UI and prompt message · 7d445f56
  Brian Talbot committed Jan 11, 2013
  
  7d445f56 Browse Files
- Merge branch 'master' into feature/cdodge/cms-master-merge3 · 08adf9c0
```
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
```
  Chris Dodge committed Jan 11, 2013
  08adf9c0 Browse Files
- Merge pull request #1267 from MITx/bug/btalbot/cms-sectiontoggling-test · d0c4e2e9
```
studio - changed expectation of lettuce test for course overview toggle
```
  Jay Zoldak committed Jan 11, 2013
  d0c4e2e9 Browse Files
- studio - changed expectation of lettuce test for course overview section toggling · e7e26a47
  Brian Talbot committed Jan 11, 2013
  
  e7e26a47 Browse Files
- Merge pull request #1266 from MITx/fix/cdodge/preview-failing · 445a923a
```
need to add the depth parameter to the DraftMongoStore   implementation ...
```
  chrisndodge committed Jan 11, 2013
  445a923a Browse Files
- need to add the depth parameter to the DraftMongoStore implementation of get_instance · 476e6c7b
  Chris Dodge committed Jan 11, 2013
  
  476e6c7b Browse Files
- Merge pull request #1265 from MITx/bug/dhm/jan13 · 0919c185
```
Handle metadata from save being empty
```
  chrisndodge committed Jan 11, 2013
  0919c185 Browse Files
- Handle metadata from save being empty · c05d8879
  Don Mitchell committed Jan 11, 2013
  
  c05d8879 Browse Files
- Drop down for markup done but w/o new icons · 64507bd5
  Don Mitchell committed Jan 11, 2013
  
  64507bd5 Browse Files
- Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf · 5368a9ad
```
Decrease the number of queries needed for LMS courseware
```
  chrisndodge committed Jan 11, 2013
  5368a9ad Browse Files
- Merge pull request #1264 from MITx/feature/cas/speed-editor · 4eca8254
```
Cheat sheet for heading and explanation.
```
  Christina Roberts committed Jan 11, 2013
  4eca8254 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 26e55f34
  Don Mitchell committed Jan 11, 2013
  
  26e55f34 Browse Files
- Merge pull request #1262 from MITx/feature/cas/speed-editor · 5e28e598
```
explanation markdown
```
  Christina Roberts committed Jan 11, 2013
  5e28e598 Browse Files
- Placeholder images for cheat sheet · d53ca05d
  Don Mitchell committed Jan 11, 2013
  
  d53ca05d Browse Files
- Cheat sheet updated for header and explanation. Video removed. · e095a139
  Don Mitchell committed Jan 11, 2013
  
  e095a139 Browse Files
10 Jan, 2013 6 commits
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 495814c0
  Don Mitchell committed Jan 10, 2013
  
  495814c0 Browse Files
- Merge pull request #1236 from MITx/diana/peer-grading-views · e97469ae
```
Peer Grading Interface
```
  Victor Shnayder committed Jan 10, 2013
  e97469ae Browse Files
- Merge pull request #1261 from MITx/fix/zoldak/studio-toggle-bdd-tests · 5205ada4
```
Add BDD lettuce tests for studio overview toggle section feature.
```
  Don Mitchell committed Jan 10, 2013
  5205ada4 Browse Files
- Merge branch 'diana/peer-grading-improvements' into diana/peer-grading-views · 5bdf91e8
  Diana Huang committed Jan 10, 2013
  
  5bdf91e8 Browse Files
- Merge branch 'master' into diana/peer-grading-views · 7fcfe035
  Diana Huang committed Jan 10, 2013
  
  7fcfe035 Browse Files
- Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements · d0e00af6
  Diana Huang committed Jan 10, 2013
  
  d0e00af6 Browse Files