Commits · e884f17d12ce1c0e94b39466992ecd6ac084a0d2 · edx / edx-platform · GitLab

14 Jan, 2013 17 commits
- Merge pull request #1272 from MITx/feature/cale/course-loading-errors · e884f17d
```
Feature/cale/course loading errors
```
  chrisndodge committed Jan 14, 2013
  e884f17d Browse Files
- Don't break the course if the grading policy is broken · 330a2eac
  Calen Pennington committed Jan 14, 2013
  
  330a2eac Browse Files
- Whitespace fixes · 95478922
  Calen Pennington committed Jan 14, 2013
  
  95478922 Browse Files
- Make errors during course loading not break the site, but just hide that course instead · 86be73f6
  Calen Pennington committed Jan 14, 2013
  
  86be73f6 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · fc2d5c43
```
Conflicts:
	lms/envs/aws.py
```
  Calen Pennington committed Jan 14, 2013
  fc2d5c43 Browse Files
- Prune deleted remote branches · 19f79fa3
  Calen Pennington committed Jan 14, 2013
  
  19f79fa3 Browse Files
- Merge pull request #1274 from MITx/fix/vik/staff-grading-settings · 0c00923a
```
Fix/vik/staff grading settings
```
  Calen Pennington committed Jan 14, 2013
  0c00923a Browse Files
- Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes · f91a5f0e
```
Fix/cdodge/filesystem xml fixes
```
  Calen Pennington committed Jan 14, 2013
  f91a5f0e Browse Files
- Minor naming fix · 1316728a
  Vik Paruchuri committed Jan 14, 2013
  
  1316728a Browse Files
- Fix staff and peer grading settings to not fail catastrophically · 0e11deff
  Vik Paruchuri committed Jan 14, 2013
  
  0e11deff Browse Files
- add end_date.html file · 9f732949
  Chris Dodge committed Jan 14, 2013
  
  9f732949 Browse Files
- add another assert test · b5776a77
  Chris Dodge committed Jan 14, 2013
  
  b5776a77 Browse Files
- add tests for about content overrides · edb913f6
  Chris Dodge committed Jan 14, 2013
  
  edb913f6 Browse Files
- be sure to first import 'extra' course content from base folder as well as a… · ac7eceb6
```
be sure to first import 'extra' course content from base folder as well as a special override folder for the course run
```
  Chris Dodge committed Jan 14, 2013
  ac7eceb6 Browse Files
- 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 19 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