Commits · 9c859fd9259f4a39ce9baf063b9fefc19c9daa0a · edx / edx-platform · GitLab

29 Sep, 2012 1 commit
- Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management · 9c859fd9
```
Feature/cdodge/cms static content management
```
  Calen Pennington committed Sep 29, 2012
  9c859fd9 Browse Files
28 Sep, 2012 13 commits
- Merge pull request #788 from MITx/bug/tomg/new-collapsibles · 7750bb47
```
Added HTML and Problem collapsibles
```
  kimth committed Sep 28, 2012
  7750bb47 Browse Files
- remove collapsible from problem template · 04119cce
  Tom Giannattasio committed Sep 28, 2012
  
  04119cce Browse Files
- added problem collapsibles · 33f0176c
  Tom Giannattasio committed Sep 28, 2012
  
  33f0176c Browse Files
- Merge pull request #783 from MITx/feature/rocha/update-jobs-page · 1977b42d
```
Remove Fellow and Course Manager positions from the jobs page
```
  Calen Pennington committed Sep 28, 2012
  1977b42d Browse Files
- added html collapsibles · 8d44e6a3
  Tom Giannattasio committed Sep 28, 2012
  
  8d44e6a3 Browse Files
- shimmy around the upload_asset widget to at least not mess up the edit unit… · 84a06037
```
shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom
```
  Chris Dodge committed Sep 28, 2012
  84a06037 Browse Files
- Add PIL (Python Image Library) to the requirements.txt file · a92a4df1
  Chris Dodge committed Sep 28, 2012
  
  a92a4df1 Browse Files
- Update doc/xml-format.md · b294c139
```
Add discussion tag
```
  kimth committed Sep 28, 2012
  b294c139 Browse Files
- Re-install both xmodule and capa before running local dev server · d8e742b9
  Calen Pennington committed Sep 28, 2012
  
  d8e742b9 Browse Files
- per feedback, use reverse() when generating callback urls. Also generate… · 1ee7646c
```
per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI.
```
  Chris Dodge committed Sep 28, 2012
  1ee7646c Browse Files
- Merge pull request #770 from MITx/feature/dave/progress_reverse_quickfix · 8838c50f
```
Put tests to check ordering of scores returned on progress page.
```
  Calen Pennington committed Sep 28, 2012
  8838c50f Browse Files
- Merge pull request #776 from MITx/lyla/cms-templates · bc947c5e
```
Lyla/cms templates
```
  Calen Pennington committed Sep 28, 2012
  bc947c5e Browse Files
- Merge pull request #784 from MITx/feature/dave/no_basic_auth_queue · c787246c
```
Make it so we don't require HTTP basic auth to talk to the queue server -- I'm merging my own PR, so please check me -- I just need to do this to get the sandbox testing happy for 6.00.
```
  David Ormsbee committed Sep 27, 2012
  c787246c Browse Files
27 Sep, 2012 17 commits
- Remove Fellow and Course Manager positions from the jobs page · 70b91813
  Carlos Andrés Rocha committed Sep 27, 2012
  
  70b91813 Browse Files
- Make it so we don't require HTTP basic auth to talk to the queue server · 7a6eedb3
  David Ormsbee committed Sep 27, 2012
  
  7a6eedb3 Browse Files
- Merge pull request #778 from MITx/hotfix/arjun/mc_style · f93115ee
```
Fixes multiple choice styling
```
  kimth committed Sep 27, 2012
  f93115ee Browse Files
- Merge pull request #781 from MITx/feature/bridger/course_grading · eb8cef93
```
Updates to grading doc.
```
  bridger committed Sep 27, 2012
  eb8cef93 Browse Files
- Add block display back for text · 71923e7c
  Arjun Singh committed Sep 27, 2012
  
  71923e7c Browse Files
- Updates to grading doc. · 55d7d2bc
  Bridger Maxwell committed Sep 27, 2012
  
  55d7d2bc Browse Files
- Support asset library references in CapaModule. Also some code… · adad3c55
```
Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit
```
  Chris Dodge committed Sep 27, 2012
  adad3c55 Browse Files
- Merge pull request #771 from MITx/feature/bridger/course_grading · 955e9012
```
Added doc explaining course grading at high level.
```
  David Ormsbee committed Sep 27, 2012
  955e9012 Browse Files
- work in progress. Need to commit before rebasing to master · 39e64c1e
  Chris Dodge committed Sep 27, 2012
  
  39e64c1e Browse Files
- support client-side caching through 'Last-Modified' response headers · 7bf7eab6
  Chris Dodge committed Sep 27, 2012
  
  7bf7eab6 Browse Files
- work-in-flight for uploading/serving of static content for courses · 7512b78e
  Chris Dodge committed Sep 27, 2012
  
  7512b78e Browse Files
- work-in-flight for uploading/serving of static content for courses · 85e6c233
  Chris Dodge committed Sep 27, 2012
  
  85e6c233 Browse Files
- Merge pull request #772 from MITx/feature/cale/fix-html-module-editing · 702c26ea
```
Feature/cale/fix html module editing
```
  Calen Pennington committed Sep 27, 2012
  702c26ea Browse Files
- Fix multiple choice style and multiple choice show answer style · 81bd0baf
  Arjun Singh committed Sep 27, 2012
  
  81bd0baf Browse Files
- Restart server when xmodule css changes (run_watch_data) · 3533497b
  Arjun Singh committed Sep 27, 2012
  
  3533497b Browse Files
- Merge pull request #777 from MITx/kimth/fix-jquery-sequence · c8d7fd78
```
Remove vestigial js include
```
  arjun810 committed Sep 26, 2012
  c8d7fd78 Browse Files
- Remove vestigial js include · 8210bfdf
  kimth committed Sep 26, 2012
  
  8210bfdf Browse Files
26 Sep, 2012 9 commits
- added several problem types · 949f638d
  Lyla Fischer committed Sep 26, 2012
  
  949f638d Browse Files
- merge with master · 3449a742
  Lyla Fischer committed Sep 26, 2012
  
  3449a742 Browse Files
- basic templates for video, html, discussion, and sequential · 8dd0feb4
  Lyla Fischer committed Sep 26, 2012
  
  8dd0feb4 Browse Files
- added basic problem types · c1c7d3a1
  Lyla Fischer committed Sep 26, 2012
  
  c1c7d3a1 Browse Files
- Merge pull request #775 from MITx/hotfix/rocha/404-email-address · 2fa122a7
```
Fix display of email address on 404 pages
```
  Calen Pennington committed Sep 26, 2012
  2fa122a7 Browse Files
- Fix display of email address on 404 pages · ed3d9443
  Carlos Andrés Rocha committed Sep 26, 2012
  
  ed3d9443 Browse Files
- Merge pull request #774 from MITx/feature/rocha/legal-terms-update · c5b5adea
```
Correct Terms of Use and Privacy static pages
```
  Calen Pennington committed Sep 26, 2012
  c5b5adea Browse Files
- Correct Terms of Use and Privacy static pages · 52bde562
  Carlos Andrés Rocha committed Sep 26, 2012
  
  52bde562 Browse Files
- Merge pull request #773 from MITx/feature/rocha/legal-terms-update · 08b7cd85
```
Update Terms of Use and Privacy static pages
```
  Calen Pennington committed Sep 26, 2012
  08b7cd85 Browse Files