Commits · a5aafc42ad24f562538f817d21143bcfeecfc81b · edx / edx-platform · GitLab

02 Jan, 2013 1 commit
- studio - resolved unit editing bug where larger images would overflow out of editing visual area · a5aafc42
  Brian Talbot committed Jan 02, 2013
  
  a5aafc42 Browse Files
28 Dec, 2012 9 commits
- Merge pull request #1215 from MITx/fix/cdodge/handout-links · a25021b6
```
basically force another build by adding a comment
```
  chrisndodge committed Dec 28, 2012
  a25021b6 Browse Files
- basically force another build by adding a comment · cf3df230
  Chris Dodge committed Dec 28, 2012
  
  cf3df230 Browse Files
- Merge pull request #1214 from MITx/fix/cdodge/handout-links · 3d6cbf47
```
add a comment. Namely we just want to trigger another build.
```
  chrisndodge committed Dec 28, 2012
  3d6cbf47 Browse Files
- add a comment. Namely we just want to trigger another build. · f3430527
  Chris Dodge committed Dec 28, 2012
  
  f3430527 Browse Files
- Merge pull request #1213 from MITx/fix/cdodge/handout-links · 4834ed35
```
add forgotten new file
```
  chrisndodge committed Dec 28, 2012
  4834ed35 Browse Files
- add forgotten new file · 725805f1
  Chris Dodge committed Dec 28, 2012
  
  725805f1 Browse Files
- Merge pull request #1212 from MITx/fix/cdodge/handout-links · cba888c6
```
Fix/cdodge/handout links
```
  Don Mitchell committed Dec 28, 2012
  cba888c6 Browse Files
- add unit test to make sure rewriting is occuring when querying the handouts · 6d20292a
  Chris Dodge committed Dec 28, 2012
  
  6d20292a Browse Files
- add in static asset link rewriting to the Course Handout section · 7a4d89b1
  Chris Dodge committed Dec 28, 2012
  
  7a4d89b1 Browse Files
27 Dec, 2012 18 commits
- Merge pull request #1211 from MITx/feature/cdodge/export · bd8661a8
```
Feature/cdodge/export
```
  Don Mitchell committed Dec 27, 2012
  bd8661a8 Browse Files
- remove unused white space and imports · 507a1dc0
  Chris Dodge committed Dec 27, 2012
  
  507a1dc0 Browse Files
- Merge pull request #1210 from MITx/fix/cdodge/wiki-slug-setting · a0fa8c98
```
append some character, in this case a '_', if the course number is reall...
```
  Don Mitchell committed Dec 27, 2012
  a0fa8c98 Browse Files
- fixes on the export. There's some attributes not being handled correctly · c0f12e69
  Chris Dodge committed Dec 27, 2012
  
  c0f12e69 Browse Files
- add service entry point to generate tar.gz file and return to caller. Use of the… · 239b118a
```
add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup.
```
  Chris Dodge committed Dec 27, 2012
  239b118a Browse Files
- Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export · 8e5fc291
  Chris Dodge committed Dec 27, 2012
  
  8e5fc291 Browse Files
- add unit test for import->export->import simple flow · 3fa425c5
  Chris Dodge committed Dec 27, 2012
  
  3fa425c5 Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export · 62523760
```
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
```
  Chris Dodge committed Dec 27, 2012
  62523760 Browse Files
- Merge pull request #1208 from MITx/feature/cdodge/clone-course · 53b73ca3
```
fix up some thumbnail issues. Also we need to manage the user permission...
```
  Don Mitchell committed Dec 27, 2012
  53b73ca3 Browse Files
- add unit tests for course cloning and deleting · 69518652
  Chris Dodge committed Dec 27, 2012
  
  69518652 Browse Files
- Merge pull request #1209 from MITx/bug/dhm/dec12 · a2d283d9
```
Got settings details unit tests to invoke the view handlers
```
  chrisndodge committed Dec 27, 2012
  a2d283d9 Browse Files
- start adding clone unit test · 9dff39dd
  Chris Dodge committed Dec 27, 2012
  
  9dff39dd Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 · 03e79cc8
  Don Mitchell committed Dec 27, 2012
  
  03e79cc8 Browse Files
- Finally! Details unit tests work and pass. Grading ones are fairly far · da343fd1
```
along.
```
  Don Mitchell committed Dec 27, 2012
  da343fd1 Browse Files
- message edit · fe408be1
  Chris Dodge committed Dec 27, 2012
  
  fe408be1 Browse Files
- fix command error message. There are really only two arguments supported (the… · 70888212
```
fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message
```
  Chris Dodge committed Dec 27, 2012
  70888212 Browse Files
- fix up some thumbnail issues. Also we need to manage the user permissions when… · 28d98274
```
fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course
```
  Chris Dodge committed Dec 27, 2012
  28d98274 Browse Files
- Merge pull request #1205 from MITx/bug/dhm/dec12 · 9f04f19a
```
Bug/dhm/dec12
```
  chrisndodge committed Dec 27, 2012
  9f04f19a Browse Files
26 Dec, 2012 8 commits
- Grader unit tests (partial) · 83bc9d7b
  Don Mitchell committed Dec 26, 2012
  
  83bc9d7b Browse Files
- Delete not-yet-implemented file · 8d9a2219
  Don Mitchell committed Dec 26, 2012
  
  8d9a2219 Browse Files
- Bug 98: no unit tests b/c it's just text in hmtl · 88b2457c
  Don Mitchell committed Dec 26, 2012
  
  88b2457c Browse Files
- Bug 99: don't show date as 'Unset' but leave out altogether if not set · a35c1386
```
plus commented out failing unit tests until I can get someone to help
debug them.
```
  Don Mitchell committed Dec 26, 2012
  a35c1386 Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 · 58abb10c
  Don Mitchell committed Dec 26, 2012
  
  58abb10c Browse Files
- Debugging unit tests · ff490599
  Don Mitchell committed Dec 26, 2012
  
  ff490599 Browse Files
- removed progress bar UI from export UI · c9e5c47b
  Brian Talbot committed Dec 26, 2012
  
  c9e5c47b Browse Files
- studio - course export UI alpha - roughing in states/views · ed3f3b02
  Brian Talbot committed Dec 26, 2012
  
  ed3f3b02 Browse Files
20 Dec, 2012 4 commits
- Merge pull request #1195 from MITx/feature/christina/misc · b65775c3
```
Fix typo in Formula Response name (Studio #101).
```
  Don Mitchell committed Dec 20, 2012
  b65775c3 Browse Files
- Fix typo in Formula Response name (Studio #101). · 37b83c1e
  cahrens committed Dec 20, 2012
  
  37b83c1e Browse Files
- Merge pull request #1194 from MITx/feature/christina/misc · 866ce8d2
```
Feature/christina/misc
```
  Don Mitchell committed Dec 20, 2012
  866ce8d2 Browse Files
- Fix for Studio #96. · 91ce2149
  cahrens committed Dec 20, 2012
  
  91ce2149 Browse Files