Commits · de2674e3df41e14589e421a020329bcf73365bfc · edx / edx-platform · GitLab

16 Jan, 2013 1 commit
- Minor cleanup. · de2674e3
  cahrens committed Jan 16, 2013
  
  de2674e3 Browse Files
14 Jan, 2013 35 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
- add another assert test · 7878a3d0
  Chris Dodge committed Jan 14, 2013
  
  7878a3d0 Browse Files
- add tests for about content overrides · 7873a44b
  Chris Dodge committed Jan 14, 2013
  
  7873a44b Browse Files
- be sure to first import 'extra' course content from base folder as well as a… · fb4766e6
```
be sure to first import 'extra' course content from base folder as well as a special override folder for the course run
```
  Chris Dodge committed Jan 14, 2013
  fb4766e6 Browse Files
- Visual Editor work. · f1ed5611
  cahrens committed Jan 14, 2013
  
  f1ed5611 Browse Files
- Merge pull request #1272 from MITx/feature/cale/course-loading-errors · e884f17d
```
Feature/cale/course loading errors
```
  chrisndodge committed Jan 14, 2013
  e884f17d Browse Files
- Don't break the course if the grading policy is broken · 330a2eac
  Calen Pennington committed Jan 14, 2013
  
  330a2eac Browse Files
- Whitespace fixes · 95478922
  Calen Pennington committed Jan 14, 2013
  
  95478922 Browse Files
- Make errors during course loading not break the site, but just hide that course instead · 86be73f6
  Calen Pennington committed Jan 14, 2013
  
  86be73f6 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · fc2d5c43
```
Conflicts:
	lms/envs/aws.py
```
  Calen Pennington committed Jan 14, 2013
  fc2d5c43 Browse Files
- Prune deleted remote branches · 19f79fa3
  Calen Pennington committed Jan 14, 2013
  
  19f79fa3 Browse Files
- Merge pull request #1274 from MITx/fix/vik/staff-grading-settings · 0c00923a
```
Fix/vik/staff grading settings
```
  Calen Pennington committed Jan 14, 2013
  0c00923a Browse Files
- Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes · f91a5f0e
```
Fix/cdodge/filesystem xml fixes
```
  Calen Pennington committed Jan 14, 2013
  f91a5f0e Browse Files
- Minor naming fix · 1316728a
  Vik Paruchuri committed Jan 14, 2013
  
  1316728a Browse Files
- Fix staff and peer grading settings to not fail catastrophically · 0e11deff
  Vik Paruchuri committed Jan 14, 2013
  
  0e11deff Browse Files
- add end_date.html file · 9f732949
  Chris Dodge committed Jan 14, 2013
  
  9f732949 Browse Files
- add another assert test · b5776a77
  Chris Dodge committed Jan 14, 2013
  
  b5776a77 Browse Files
- add tests for about content overrides · edb913f6
  Chris Dodge committed Jan 14, 2013
  
  edb913f6 Browse Files
- be sure to first import 'extra' course content from base folder as well as a… · ac7eceb6
```
be sure to first import 'extra' course content from base folder as well as a special override folder for the course run
```
  Chris Dodge committed Jan 14, 2013
  ac7eceb6 Browse Files
- Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce · c1c64e6b
  cahrens committed Jan 14, 2013
  
  c1c64e6b Browse Files
- Merge pull request #1268 from MITx/feature/cas/speed-editor · c9c9f7e5
```
menu bar for heading and explanation
```
  Christina Roberts committed Jan 14, 2013
  c9c9f7e5 Browse Files
- problem editor - revised classes on editor cheatsheet text and explanation tooltip text · e82987a3
  Brian Talbot committed Jan 14, 2013
  
  e82987a3 Browse Files
- Merge pull request #1270 from MITx/bug/dhm/jan13 · fdba0e48
```
Fixed bug 114: randomized problems never right b/c state not preserved
```
  chrisndodge committed Jan 14, 2013
  fdba0e48 Browse Files
13 Jan, 2013 4 commits
- one last style tweak to problem header styling · 11656feb
  Brian Talbot committed Jan 13, 2013
  
  11656feb Browse Files
- resolved problem headers/general H1 elements floating by default in component views · 24291927
  Brian Talbot committed Jan 13, 2013
  
  24291927 Browse Files
- revised cheatsheet markdown, fixed height + added vertical scroll, and replaced… · 1cf5e10a
```
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
```
  Brian Talbot committed Jan 13, 2013
  1cf5e10a Browse Files
- added in icons for header and explanation markdown elements · 04e94473
  Brian Talbot committed Jan 13, 2013
  
  04e94473 Browse Files