Commits · 77865f7ab2b36010304d44521e19e279e6d8f834 · edx / edx-platform · GitLab

17 Jan, 2013 8 commits
- 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
- 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
- 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 12 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 #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
- studio HTML editor - codemirror/tinymce toggle work - wip · e8ba078d
  Brian Talbot committed Jan 16, 2013
  
  e8ba078d 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
- 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 #1286 from MITx/feature/christina/misc · ebca3af7
```
Feature/christina/misc
```
  chrisndodge committed Jan 16, 2013
  ebca3af7 Browse Files
- Minor cleanup. · de2674e3
  cahrens committed Jan 16, 2013
  
  de2674e3 Browse Files
- Minor cleanup. · 65d45d6d
  cahrens committed Jan 16, 2013
  
  65d45d6d Browse Files
- storing work · 07d6bee5
  cahrens committed Jan 16, 2013
  
  07d6bee5 Browse Files
15 Jan, 2013 7 commits
- storing work · 9818664b
  cahrens committed Jan 15, 2013
  
  9818664b Browse Files
- abstracted out common editor styles shared by problem and html editors · ed6134ea
  Brian Talbot committed Jan 15, 2013
  
  ed6134ea Browse Files
- Proposed changes to fix asset caching bug. · 04614078
  cahrens committed Jan 15, 2013
  
  04614078 Browse Files
- separated common editor UI from problem and HTML editor SCSS - wip · 623769e9
  Brian Talbot committed Jan 15, 2013
  
  623769e9 Browse Files
- allow for optional 'COURSE_DIR' parameter for the import rake target so that we… · 39769ea9
```
allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course
```
  Chris Dodge committed Jan 14, 2013
  39769ea9 Browse Files
- add some additional logging for optional verbosity · 1cb2a672
  Chris Dodge committed Jan 14, 2013
  
  1cb2a672 Browse Files
- fix crash on command line import when no namespace rename has been given · 3e736ae9
  Chris Dodge committed Jan 14, 2013
  
  3e736ae9 Browse Files
14 Jan, 2013 13 commits
- Merge branch 'feature/christina/tiny-mce' of github.com:MITx/mitx into feature/christina/tiny-mce · 0a7de9aa
  cahrens committed Jan 14, 2013
  
  0a7de9aa Browse Files
- Visual Editor work. · 1f681b4d
  cahrens committed Jan 14, 2013
  
  1f681b4d Browse Files
- Pretty much works. · 29f49895
  cahrens committed Jan 14, 2013
  
  29f49895 Browse Files
- Saving work. · db987575
  cahrens committed Jan 14, 2013
  
  db987575 Browse Files
- Version 3.5.8 of tinyMCE. http://www.tinymce.com/ · b58577a9
  cahrens committed Jan 14, 2013
  
  b58577a9 Browse Files
- Delete old version of tiny_mce. · 6312022b
  cahrens committed Jan 14, 2013
  
  6312022b Browse Files
- tiny_mce · 3cc63f1b
  cahrens committed Jan 14, 2013
  
  3cc63f1b Browse Files
- Work in progress, related to rich HTML editor. · c4ec8ead
  cahrens committed Jan 14, 2013
  
  c4ec8ead Browse Files
- Don't break the course if the grading policy is broken · 602435fc
  Calen Pennington committed Jan 14, 2013
  
  602435fc Browse Files
- Whitespace fixes · 79e4c606
  Calen Pennington committed Jan 14, 2013
  
  79e4c606 Browse Files
- Make errors during course loading not break the site, but just hide that course instead · 64df5cc0
  Calen Pennington committed Jan 14, 2013
  
  64df5cc0 Browse Files
- Prune deleted remote branches · 51868aad
  Calen Pennington committed Jan 14, 2013
  
  51868aad Browse Files
- add end_date.html file · c195b139
  Chris Dodge committed Jan 14, 2013
  
  c195b139 Browse Files