Commits · 38f5761a89fa15e4236e889e0a70d2501b46cb51 · edx / edx-platform · GitLab

11 Oct, 2012 21 commits
- Merge pull request #864 from MITx/bug/lyla/numericalresponse · 38f5761a
```
quick bug fix
```
  Calen Pennington committed Oct 11, 2012
  38f5761a Browse Files
- quick bug fix · 1bd2cb4f
  Lyla Fischer committed Oct 11, 2012
  
  1bd2cb4f Browse Files
- Merge pull request #848 from MITx/feature/cas/lyla/asset-store-integration · f0108757
```
Feature/cas/lyla/asset store integration
```
  Calen Pennington committed Oct 11, 2012
  f0108757 Browse Files
- added embeddable links · f06c67ef
  Lyla Fischer committed Oct 11, 2012
  
  f06c67ef Browse Files
- fixed date display · 0bd5446f
  Lyla Fischer committed Oct 11, 2012
  
  0bd5446f Browse Files
- fix up commenting after refactoring. Also, don't reraise an exception during… · 115d7358
```
fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue.
```
  Chris Dodge committed Oct 11, 2012
  115d7358 Browse Files
- schema change to better normalize asset->thumbnail relationships · 2153aae6
  Chris Dodge committed Oct 11, 2012
  
  2153aae6 Browse Files
- thumnail image is a thumnail image · 63786822
  Lyla Fischer committed Oct 11, 2012
  
  63786822 Browse Files
- fixed erroneous order · 83eeb196
  Lyla Fischer committed Oct 11, 2012
  
  83eeb196 Browse Files
- thinks work, they just don't display prettily, and it is hard to actually use… · f26a4af7
```
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
```
  Lyla Fischer committed Oct 11, 2012
  f26a4af7 Browse Files
- slight refactoring of the javascript · 7791a7c4
  Lyla Fischer committed Oct 11, 2012
  
  7791a7c4 Browse Files
- fixed up some of the ajax feedback to display to the user · d35ff48e
  Lyla Fischer committed Oct 11, 2012
  
  d35ff48e Browse Files
- cleaned filenames · deca6e66
  Lyla Fischer committed Oct 11, 2012
  
  deca6e66 Browse Files
- things now upload · 65e3982f
  Lyla Fischer committed Oct 11, 2012
  
  65e3982f Browse Files
- Merge pull request #859 from MITx/feature/tomg/cas-404 · 6a7fb1d5
```
template for 404 and 500 errors
```
  Calen Pennington committed Oct 11, 2012
  6a7fb1d5 Browse Files
- template for 404 and 500 errors · 782e5f51
  Tom Giannattasio committed Oct 11, 2012
  
  782e5f51 Browse Files
- Merge pull request #858 from MITx/feature/cdodge/cas-crud-section-subsection · 5eb0ca69
```
a 'section' is actually a 'chapter' in previous nomenclature
```
  Calen Pennington committed Oct 11, 2012
  5eb0ca69 Browse Files
- a 'section' is actually a 'chapter' in previous nomenclature · b77298b2
  Chris Dodge committed Oct 11, 2012
  
  b77298b2 Browse Files
- Merge pull request #852 from MITx/feature/cdodge/cas-crud-section-subsection · bdf8a55a
```
Add basic section/subsection CRUD on the overview page
```
  Calen Pennington committed Oct 11, 2012
  bdf8a55a Browse Files
- Fix minor typo in access.py · c8d267fb
  Calen Pennington committed Oct 10, 2012
  
  c8d267fb Browse Files
- Merge pull request #853 from MITx/feature/tomg/style-polishing · a9ca84da
```
numerous style tweaks and user management page
```
  Calen Pennington committed Oct 10, 2012
  a9ca84da Browse Files
10 Oct, 2012 19 commits
- removed console logs · 8d78073a
  Tom Giannattasio committed Oct 10, 2012
  
  8d78073a Browse Files
- tweaks to new component animations · edc32e9d
  Tom Giannattasio committed Oct 10, 2012
  
  edc32e9d Browse Files
- white drag handles for components · 564c138b
  Tom Giannattasio committed Oct 10, 2012
  
  564c138b Browse Files
- added html icon · 8f488c3f
  Tom Giannattasio committed Oct 10, 2012
  
  8f488c3f Browse Files
- styled log in and sign up errors; fixed expand/collapse transition bug · bbed49db
  Tom Giannattasio committed Oct 10, 2012
  
  bbed49db Browse Files
- styled/tweaked users page · 07ac0d06
  Tom Giannattasio committed Oct 10, 2012
  
  07ac0d06 Browse Files
- added ellipsis text overflow in unit tree · 2efe4cf6
  Tom Giannattasio committed Oct 10, 2012
  
  2efe4cf6 Browse Files
- tightened unit tree nesting · f98963aa
  Tom Giannattasio committed Oct 10, 2012
  
  f98963aa Browse Files
- tightened unit treeview styles · b95374c7
  Tom Giannattasio committed Oct 10, 2012
  
  b95374c7 Browse Files
- fix merge conflict · 7d235247
  Chris Dodge committed Oct 10, 2012
  
  7d235247 Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 7107e3ee
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection

Conflicts:
	cms/static/js/base.js
```
  Chris Dodge committed Oct 10, 2012
  7107e3ee Browse Files
- Merge pull request #845 from MITx/feature/tomg/cas-static-tabs · 6e4fe502
```
added static tab templates
```
  Calen Pennington committed Oct 10, 2012
  6e4fe502 Browse Files
- Add basic section/subsection CRUD on the overview page · de303755
  Chris Dodge committed Oct 10, 2012
  
  de303755 Browse Files
- Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page · bfb49133
```
Feature/cdodge/subsection edit page
```
  Calen Pennington committed Oct 10, 2012
  bfb49133 Browse Files
- Merge pull request #851 from MITx/feature/tomg/cas-edit-on-top · c6cf4b5b
```
moved component editor to top
```
  Calen Pennington committed Oct 10, 2012
  c6cf4b5b Browse Files
- Merge pull request #834 from MITx/feature/cale/cas-draft-mode · a9560cdf
```
CAS Draft Mode
```
  Calen Pennington committed Oct 10, 2012
  a9560cdf Browse Files
- Wire component deletion back up · 9ea3039b
  Calen Pennington committed Oct 10, 2012
  
  9ea3039b Browse Files
- Make it impossible to drag belowe New Component on views · 8b72de9a
  Calen Pennington committed Oct 10, 2012
  
  8b72de9a Browse Files
- Make component drag-and-drop a little nicer · 95b3f0d7
  Calen Pennington committed Oct 10, 2012
  
  95b3f0d7 Browse Files