Commits · 1b4f569c08b39ee8a0b26673d4cfe3b89a91ad0b · edx / edx-platform · GitLab

14 Oct, 2012 5 commits
- Merge pull request #894 from MITx/fix/cdodge/cas-bugs · 1b4f569c
```
Fix/cdodge/cas bugs
```
  chrisndodge committed Oct 13, 2012
  1b4f569c Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs · 13e23cbb
```
Conflicts:
	cms/templates/widgets/header.html
```
  Chris Dodge committed Oct 13, 2012
  13e23cbb Browse Files
- Merge pull request #883 from MITx/fix/cale/edge-bugs · 91fe7da4
```
Fix/cale/edge bugs
```
  chrisndodge committed Oct 13, 2012
  91fe7da4 Browse Files
- Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs · ebf6d747
```
Conflicts:
	cms/static/js/base.js
```
  Chris Dodge committed Oct 13, 2012
  ebf6d747 Browse Files
- make delete unit delete both the draft and non-draft versions · 258a467f
  Chris Dodge committed Oct 13, 2012
  
  258a467f Browse Files
13 Oct, 2012 8 commits
- save_item should also do proper 'is this element draft aware' logic so that… · 271fa695
```
save_item should also do proper 'is this element draft aware' logic so that incorrect versioning occurs on elements which do not support versioning at this point in time (aka courses, sections, and subsections).
```
  Chris Dodge committed Oct 13, 2012
  271fa695 Browse Files
- hack patch to at least keep the unit.html page from blowing up · cbc619f8
  Chris Dodge committed Oct 13, 2012
  
  cbc619f8 Browse Files
- don't display a broken thumbnail image if a thumbnail is not available · 2e43d2eb
  Chris Dodge committed Oct 13, 2012
  
  2e43d2eb Browse Files
- hide search button on asset index page · f1517fef
  Chris Dodge committed Oct 13, 2012
  
  f1517fef Browse Files
- remove wip on Import header button · 8151b103
  Chris Dodge committed Oct 13, 2012
  
  8151b103 Browse Files
- Merge pull request #890 from MITx/feature/cdodge/cas-new-course · edb31c97
```
Feature/cdodge/cas new course
```
  chrisndodge committed Oct 12, 2012
  edb31c97 Browse Files
- add new files · a12baec5
  Chris Dodge committed Oct 12, 2012
  
  a12baec5 Browse Files
- create course. Quick review on import. Add progress bar stuff to import as well as redirect · a58e6ce9
  Chris Dodge committed Oct 12, 2012
  
  a58e6ce9 Browse Files
12 Oct, 2012 27 commits
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-new-course · 26e735b1
  Chris Dodge committed Oct 12, 2012
  
  26e735b1 Browse Files
- wip: create new course · 4e4b6acc
  Chris Dodge committed Oct 12, 2012
  
  4e4b6acc Browse Files
- Add date display when subsection date is set and section date isn't · 64240c44
  Calen Pennington committed Oct 12, 2012
  
  64240c44 Browse Files
- Enable section and subsection reordering (with no drag between them) · 623c756b
  Calen Pennington committed Oct 12, 2012
  
  623c756b Browse Files
- Fix date display in unit page · a160f614
  Calen Pennington committed Oct 12, 2012
  
  a160f614 Browse Files
- Hide/show wips w/ press of 'w' key · 4005cbf4
  Calen Pennington committed Oct 12, 2012
  
  4005cbf4 Browse Files
- Make separate links for lms_preview and lms as needed · 607b99de
  Calen Pennington committed Oct 12, 2012
  
  607b99de Browse Files
- Only try to remove a directory if it exists during import · d10f56dd
  Calen Pennington committed Oct 12, 2012
  
  d10f56dd Browse Files
- Remove scheme on jquery.form.js load so that it works over https · fb48a4fb
  Calen Pennington committed Oct 12, 2012
  
  fb48a4fb Browse Files
- Fix edit_unit header to point to the correct course module · ab913cb5
  Calen Pennington committed Oct 12, 2012
  
  ab913cb5 Browse Files
- Fix context course on edit subsection · 90a847cb
  Calen Pennington committed Oct 12, 2012
  
  90a847cb Browse Files
- Merge pull request #881 from MITx/fix/cdodge/cas-thumbnail-exception-handling · 0e277277
```
swallow exceptions when generating thumbnails
```
  Calen Pennington committed Oct 12, 2012
  0e277277 Browse Files
- log and continue on thumbnail generation exception · d31a7c6d
  Chris Dodge committed Oct 12, 2012
  
  d31a7c6d Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 78df2660
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-thumbnail-exception-handling
```
  Chris Dodge committed Oct 12, 2012
  78df2660 Browse Files
- Merge pull request #879 from MITx/feature/cale/cas-import-ui · 5aa474a1
```
Feature/cale/cas import ui
```
  chrisndodge committed Oct 12, 2012
  5aa474a1 Browse Files
- Wire up import to the frontend, and make sure that it puts it into the already extant course · c70f29e8
  Calen Pennington committed Oct 12, 2012
  
  c70f29e8 Browse Files
- swallow exceptions when generating thumbnails · b17836f2
  Chris Dodge committed Oct 12, 2012
  
  b17836f2 Browse Files
- removed red import button – drawing too much attention; this will be reworked… · 3d2a1c24
```
removed red import button – drawing too much attention; this will be reworked onto a different page at some point anyways
```
  Tom Giannattasio committed Oct 12, 2012
  3d2a1c24 Browse Files
- styled import page · c7cdaf80
  Tom Giannattasio committed Oct 12, 2012
  
  c7cdaf80 Browse Files
- Add import page template · c2abd4b5
  Calen Pennington committed Oct 12, 2012
  
  c2abd4b5 Browse Files
- First stab at an import page. Needs styling · 02a325b0
  Calen Pennington committed Oct 12, 2012
  
  02a325b0 Browse Files
- Merge pull request #880 from MITx/feature/cale/edge-landing-page · 9cf5cd08
```
styled edge registration form
```
  Calen Pennington committed Oct 12, 2012
  9cf5cd08 Browse Files
- styled edge registration form · a9ba3543
  Tom Giannattasio committed Oct 12, 2012
  
  a9ba3543 Browse Files
- Make header tabs work · ac71da15
  Calen Pennington committed Oct 12, 2012
  
  ac71da15 Browse Files
- Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression · ff25d132
```
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
```
  chrisndodge committed Oct 12, 2012
  ff25d132 Browse Files
- Standardize on how we bypass the draft-aware modulestore · 3c8de11f
  Calen Pennington committed Oct 12, 2012
  
  3c8de11f Browse Files
- Merge pull request #878 from MITx/feature/cale/edge-landing-page · 750e70e8
```
Feature/cale/edge landing page
```
  chrisndodge committed Oct 12, 2012
  750e70e8 Browse Files