Commits · 9520290018edee0c9929f4bb02de216f3fd19bf4 · edx / edx-platform · GitLab

22 Jan, 2013 1 commit
- add optional course_id parameter to DraftMongoStore.get_items() · 95202900
  Chris Dodge committed Jan 22, 2013
  
  95202900 Browse Files
18 Jan, 2013 12 commits
- Merge pull request #1312 from MITx/feature/christina/misc · 381ede20
```
Need path to tiny mce JS file now.
```
  chrisndodge committed Jan 18, 2013
  381ede20 Browse Files
- Need path to tiny mce JS file now. · 700b0f14
  cahrens committed Jan 18, 2013
  
  700b0f14 Browse Files
- Merge pull request #1311 from MITx/style/btalbot/cms-tinymce · b4de7fac
```
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
```
  Christina Roberts committed Jan 18, 2013
  b4de7fac Browse Files
- studio - adding in LMS synced styles for TinyMCE WYSIWYG preview · 72fc192f
  Brian Talbot committed Jan 18, 2013
  
  72fc192f Browse Files
- Fix the virtualenv creation for Jenkins. · aeee13ab
  Ashley Penney committed Jan 18, 2013
  
  aeee13ab Browse Files
- Merge pull request #1305 from MITx/style/btalbot/cms-component-submenus · 71e358d7
```
Removed editor type icon/text from all component sub menus except problem
```
  Christina Roberts committed Jan 18, 2013
  71e358d7 Browse Files
- Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes · 031e79ec
```
only cache discussion forum info for 5 minutes before flushing. This is ...
```
  chrisndodge committed Jan 17, 2013
  031e79ec Browse Files
- only cache discussion forum info for 5 minutes before flushing. This is needed… · c6276c83
```
only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata
```
  Chris Dodge committed Jan 17, 2013
  c6276c83 Browse Files
- Merge pull request #1307 from MITx/feature/christina/tiny-mce · 9753ff56
```
Feature/christina/tiny mce
```
  chrisndodge committed Jan 17, 2013
  9753ff56 Browse Files
- Relative path seems to work. · a4196ffa
  cahrens committed Jan 17, 2013
  
  a4196ffa Browse Files
- Add a comment. · 8cca1939
  cahrens committed Jan 17, 2013
  
  8cca1939 Browse Files
- Workaround for sandbox. · a1bb533b
  cahrens committed Jan 17, 2013
  
  a1bb533b Browse Files
17 Jan, 2013 11 commits
- studio - removing extra line/whitespace in sass · 5b82a68c
  Brian Talbot committed Jan 17, 2013
  
  5b82a68c Browse Files
- studio - removed editor type icon and text for all components except for problems · 66a3e962
  Brian Talbot committed Jan 17, 2013
  
  66a3e962 Browse Files
- 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
- 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 4 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