Commits · d53669fcb90aca1ced47c7c11f46ce0dc58337ea · edx / edx-platform · GitLab

09 Jan, 2013 9 commits
- Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor · d53669fc
  cahrens committed Jan 09, 2013
  
  d53669fc Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · b704645f
  cahrens committed Jan 09, 2013
  
  b704645f Browse Files
- Warn user when going to XML Editor. Cleanup and comments. · b9795596
  cahrens committed Jan 09, 2013
  
  b9795596 Browse Files
- Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing · 21f5c2d8
```
Set up the framework for running lettuce tests against studio
```
  Don Mitchell committed Jan 09, 2013
  21f5c2d8 Browse Files
- Merge pull request #1241 from MITx/bug/dhm/jan13 · 2b879408
```
Fix iframe conversion problem (111)
```
  chrisndodge committed Jan 09, 2013
  2b879408 Browse Files
- Merge pull request #1243 from MITx/fix/cdodge/missing-setting-for-cms · 21fc7340
```
add required video setting
```
  chrisndodge committed Jan 09, 2013
  21fc7340 Browse Files
- add required video setting · b8074b8b
  Chris Dodge committed Jan 09, 2013
  
  b8074b8b Browse Files
- studio - resolving merge conflict with cms/templates/unit.html · 2a1e102f
  Brian Talbot committed Jan 09, 2013
  
  2a1e102f Browse Files
- studio - problem speed editor: tweaking presentation of problem sub menu further · f60a9d8d
  Brian Talbot committed Jan 09, 2013
  
  f60a9d8d Browse Files
08 Jan, 2013 14 commits
- Added unit tests and generalized a catch · 83b7997d
  Don Mitchell committed Jan 08, 2013
  
  83b7997d Browse Files
- studio - problem speed editor: revised html and DOM for problem sub menu · 75447eb8
  Brian Talbot committed Jan 08, 2013
  
  75447eb8 Browse Files
- Delete speed-editor.js and cruft from unit.html. · c7feee5b
  cahrens committed Jan 08, 2013
  
  c7feee5b Browse Files
- Use html rather than xml parsing for course updates · 1708dc40
  Don Mitchell committed Jan 08, 2013
  
  1708dc40 Browse Files
- Fix formatting. · 4ac15daf
  cahrens committed Jan 08, 2013
  
  4ac15daf Browse Files
- Merge in Don's change. · 94696786
  cahrens committed Jan 08, 2013
  
  94696786 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · f616aecd
```
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
```
  cahrens committed Jan 08, 2013
  f616aecd Browse Files
- Set up the framework for running lettuce tests against studio · f056f062
  Jay Zoldak committed Jan 08, 2013
  
  f056f062 Browse Files
- Save work · bc10d080
  cahrens committed Jan 08, 2013
  
  bc10d080 Browse Files
- CapaDescriptor new unit tests · ae4e7815
  Don Mitchell committed Jan 08, 2013
  
  ae4e7815 Browse Files
- Merge pull request #1238 from MITx/fix/cdodge/turn-of-module-wrappers · 7377f4bd
```
make sure we turn off module wrappers for the 'ancillary' course content
```
  chrisndodge committed Jan 08, 2013
  7377f4bd Browse Files
- Added is_empty to model presented to unit.html · 6e2b4a07
  Don Mitchell committed Jan 08, 2013
  
  6e2b4a07 Browse Files
- make sure we turn off module wrappers for the 'ancillary' course content · 99750a68
  Chris Dodge committed Jan 08, 2013
  
  99750a68 Browse Files
- Empty template now recognized as allowing markdown editing · 76f2ef6f
```
Save saves markdown and updates the xml
```
  Don Mitchell committed Jan 08, 2013
  76f2ef6f Browse Files
07 Jan, 2013 17 commits
- Merge pull request #1237 from MITx/fix/cdodge/return-bad-request · ca32a8b0
```
be sure to return an instance of the class
```
  Don Mitchell committed Jan 07, 2013
  ca32a8b0 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 735aa134
  Don Mitchell committed Jan 07, 2013
  
  735aa134 Browse Files
- xml conversion unit tests plus a fix to the conversion which they · e46a76da
```
brought to light
```
  Don Mitchell committed Jan 07, 2013
  e46a76da Browse Files
- be sure to return an instance of the class · c7d81cc4
  Chris Dodge committed Jan 07, 2013
  
  c7d81cc4 Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 5711a9af
  cahrens committed Jan 07, 2013
  
  5711a9af Browse Files
- Add insertion of problem types. · d7b05e48
  cahrens committed Jan 07, 2013
  
  d7b05e48 Browse Files
- Yaml files now generate markdown in a readable and xml convertable · d8d4c373
```
format. The xml converter works. 
```
  Don Mitchell committed Jan 07, 2013
  d8d4c373 Browse Files
- Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2 · 791c00cd
```
Feature/cdodge/cms master merge2
```
  chrisndodge committed Jan 07, 2013
  791c00cd Browse Files
- put back in .gitmodules which got accidentally deleted · 82b48dd2
  Chris Dodge committed Jan 07, 2013
  
  82b48dd2 Browse Files
- Merge branch 'master' into feature/cdodge/cms-master-merge2 · 3b5e17ef
```
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
```
  Chris Dodge committed Jan 07, 2013
  3b5e17ef Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · 9dad3ba9
  Don Mitchell committed Jan 07, 2013
  
  9dad3ba9 Browse Files
- Hopefully fixed yamls for markdown · c2f0ea49
  Don Mitchell committed Jan 07, 2013
  
  c2f0ea49 Browse Files
- Update for Don's change. · 75b97409
  cahrens committed Jan 07, 2013
  
  75b97409 Browse Files
- merge · e296d52c
  cahrens committed Jan 07, 2013
  
  e296d52c Browse Files
- Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor · be07c7f8
  cahrens committed Jan 07, 2013
  
  be07c7f8 Browse Files
- Starting to add toolbar items. · bf2a945a
  cahrens committed Jan 07, 2013
  
  bf2a945a Browse Files
- Numerical response now works and round tripping works. · 42246142
  Don Mitchell committed Jan 07, 2013
  
  42246142 Browse Files