Commits · 0e2d8be4420629e1c02ae36585b84959c50c4751 · edx / edx-platform · GitLab

18 Jan, 2013 1 commit
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 0e2d8be4
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
```
  Chris Dodge committed Jan 17, 2013
  0e2d8be4 Browse Files
17 Jan, 2013 13 commits
- Merge pull request #1303 from MITx/feature/christina/tiny-mce · f64ffd25
```
Feature/christina/tiny mce
```
  chrisndodge committed Jan 17, 2013
  f64ffd25 Browse Files
- Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce · 77865f7a
  cahrens committed Jan 17, 2013
  
  77865f7a Browse Files
- Merge pull request #1300 from MITx/fix/cdodge/no-caching-in-preview · fe5d7285
```
disable caching in draft mode stores. It doesn't behave as we expect and...
```
  chrisndodge committed Jan 17, 2013
  fe5d7285 Browse Files
- Change the div being used to create code mirror to a textarea-- just make sure… · 5f05ec83
```
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
```
  cahrens committed Jan 17, 2013
  5f05ec83 Browse Files
- disable caching in draft mode stores. It doesn't behave as we expect and we need… · fe964ec8
```
disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate
```
  Chris Dodge committed Jan 17, 2013
  fe964ec8 Browse Files
- remove obsolete test (per Vik) · 45bb511e
  Chris Dodge committed Jan 17, 2013
  
  45bb511e Browse Files
- Merge pull request #1298 from MITx/feature/christina/misc · ebb29763
```
Escape text being passed to markdown editor, delete copied (and unused) JS code
```
  Don Mitchell committed Jan 17, 2013
  ebb29763 Browse Files
- Some refactoring from Brian's submission. · b6fcf3a5
  cahrens committed Jan 17, 2013
  
  b6fcf3a5 Browse Files
- fix up testing failures post merge · fcf92a37
  Chris Dodge committed Jan 17, 2013
  
  fcf92a37 Browse Files
- resolve merge conflicts · 48cbf38a
  Chris Dodge committed Jan 17, 2013
  
  48cbf38a Browse Files
- Merge branch 'master' into feature/cdodge/cms-master-merge4 · 22695d80
```
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
```
  Chris Dodge committed Jan 17, 2013
  22695d80 Browse Files
- in progress · d07a9203
  cahrens committed Jan 17, 2013
  
  d07a9203 Browse Files
- Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes · 358c56da
```
Fix/cdodge/filesystem xml fixes
```
  chrisndodge committed Jan 17, 2013
  358c56da Browse Files
16 Jan, 2013 25 commits
- studio html editor - added in visual assets needed for previous UI syncing · db7443ce
  Brian Talbot committed Jan 16, 2013
  
  db7443ce Browse Files
- studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js · f34fd5c4
  Brian Talbot committed Jan 16, 2013
  
  f34fd5c4 Browse Files
- Merge pull request #1280 from MITx/feature/jth/attempts_reset · fd20496a
```
Added 2 new instructor tools
```
  David Ormsbee committed Jan 16, 2013
  fd20496a Browse Files
- Use reverse() to lookup student progress page, use index to lookup module_state_key · f7f563db
  John Hess committed Jan 16, 2013
  
  f7f563db Browse Files
- Merge pull request #1293 from MITx/feature/christina/misc · 2f136384
```
Fix bug related to creation of thumbnails for non-image files.
```
  chrisndodge committed Jan 16, 2013
  2f136384 Browse Files
- Fix bug related to creation of thumbnails for non-image files. · bc80779f
```
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
```
  cahrens committed Jan 16, 2013
  bc80779f Browse Files
- Merge pull request #1292 from MITx/bugfix/apenney/jenkins · ad68177e
```
Another minor tweak to limit these tests to the cms.
```
  Jay Zoldak committed Jan 16, 2013
  ad68177e Browse Files
- Remove this altogether. · 0193cc59
  Ashley Penney committed Jan 16, 2013
  
  0193cc59 Browse Files
- studio HTML editor - codemirror/tinymce toggle work - wip · e8ba078d
  Brian Talbot committed Jan 16, 2013
  
  e8ba078d Browse Files
- Another minor tweak to limit these tests to the cms. · 9dd9727b
  Ashley Penney committed Jan 16, 2013
  
  9dd9727b Browse Files
- Merge pull request #1290 from MITx/feature/christina/misc · 808c9933
```
A couple of bug fixes.
```
  Don Mitchell committed Jan 16, 2013
  808c9933 Browse Files
- Merge pull request #1291 from MITx/bugfix/apenney/jenkins · baa0e9be
```
Lets explicitly make the virtualenvs for now.
```
  Jay Zoldak committed Jan 16, 2013
  baa0e9be Browse Files
- Lets explicitly make the virtualenvs for now. · e38b4415
  Ashley Penney committed Jan 16, 2013
  
  e38b4415 Browse Files
- Fix bug related to img link for non-img files. · d4f79c04
```
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
```
  cahrens committed Jan 16, 2013
  d4f79c04 Browse Files
- Fix multiple choice checkbox. · cc5a5e29
```
#117
```
  cahrens committed Jan 16, 2013
  cc5a5e29 Browse Files
- Merge pull request #1289 from MITx/bugfix/dave/dont_explode_askbot_migration · aa5ede3f
```
Add a try/catch so that Askbot removal doesn't die if there's no Askbot ...
```
  Ashley Penney committed Jan 16, 2013
  aa5ede3f Browse Files
- Merge pull request #1286 from MITx/feature/christina/misc · ebca3af7
```
Feature/christina/misc
```
  chrisndodge committed Jan 16, 2013
  ebca3af7 Browse Files
- Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user · 5d664900
  David Ormsbee committed Jan 16, 2013
  
  5d664900 Browse Files
- Minor cleanup. · de2674e3
  cahrens committed Jan 16, 2013
  
  de2674e3 Browse Files
- Merge pull request #1246 from MITx/feature/brian/pearson-reg · 29c5d00b
```
Feature/brian/pearson reg
```
  brianhw committed Jan 16, 2013
  29c5d00b Browse Files
- Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg · bfb5f5e5
  Brian Wilson committed Jan 16, 2013
  
  bfb5f5e5 Browse Files
- use new-style class for TestCenterExam · cc1b50ee
  Brian Wilson committed Jan 16, 2013
  
  cc1b50ee Browse Files
- Minor cleanup. · 65d45d6d
  cahrens committed Jan 16, 2013
  
  65d45d6d Browse Files
- storing work · 07d6bee5
  cahrens committed Jan 16, 2013
  
  07d6bee5 Browse Files
- Merge pull request #1271 from MITx/feature/victor/beta-testers · 9519087d
```
Feature/victor/beta testers
```
  Victor Shnayder committed Jan 16, 2013
  9519087d Browse Files
15 Jan, 2013 1 commit
- fix bug in string splitting. · b188c8e7
  Victor Shnayder committed Jan 15, 2013
  
  b188c8e7 Browse Files