Calen Pennington
9c859fd925
Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management
...
Feature/cdodge/cms static content management
2012-09-29 07:39:50 -07:00
kimth
7750bb471c
Merge pull request #788 from MITx/bug/tomg/new-collapsibles
...
Added HTML and Problem collapsibles
2012-09-28 10:03:50 -07:00
Tom Giannattasio
04119cce3f
remove collapsible from problem template
2012-09-28 12:37:25 -04:00
Tom Giannattasio
33f0176c33
added problem collapsibles
2012-09-28 12:09:38 -04:00
Calen Pennington
1977b42d5b
Merge pull request #783 from MITx/feature/rocha/update-jobs-page
...
Remove Fellow and Course Manager positions from the jobs page
2012-09-28 09:09:32 -07:00
Tom Giannattasio
8d44e6a3db
added html collapsibles
2012-09-28 12:06:29 -04:00
Chris Dodge
84a0603754
shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom
2012-09-28 11:42:11 -04:00
Chris Dodge
a92a4df1bc
Add PIL (Python Image Library) to the requirements.txt file
2012-09-28 11:22:35 -04:00
kimth
b294c139ce
Update doc/xml-format.md
...
Add discussion tag
2012-09-28 07:45:50 -07:00
Calen Pennington
d8e742b9ee
Re-install both xmodule and capa before running local dev server
2012-09-28 10:33:22 -04:00
Chris Dodge
1ee7646cfc
per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI.
2012-09-28 10:20:57 -04:00
Calen Pennington
8838c50f0d
Merge pull request #770 from MITx/feature/dave/progress_reverse_quickfix
...
Put tests to check ordering of scores returned on progress page.
2012-09-28 05:56:56 -07:00
Calen Pennington
bc947c5e4e
Merge pull request #776 from MITx/lyla/cms-templates
...
Lyla/cms templates
2012-09-28 05:55:39 -07:00
David Ormsbee
c787246c15
Merge pull request #784 from MITx/feature/dave/no_basic_auth_queue
...
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.
2012-09-27 17:20:36 -07:00
Carlos Andrés Rocha
70b91813a9
Remove Fellow and Course Manager positions from the jobs page
2012-09-27 19:29:42 -04:00
David Ormsbee
7a6eedb3f1
Make it so we don't require HTTP basic auth to talk to the queue server
2012-09-27 19:02:34 -04:00
kimth
f93115ee4d
Merge pull request #778 from MITx/hotfix/arjun/mc_style
...
Fixes multiple choice styling
2012-09-27 13:41:20 -07:00
bridger
eb8cef9308
Merge pull request #781 from MITx/feature/bridger/course_grading
...
Updates to grading doc.
2012-09-27 13:39:09 -07:00
Arjun Singh
71923e7c1f
Add block display back for text
2012-09-27 13:31:08 -07:00
Bridger Maxwell
55d7d2bc14
Updates to grading doc.
2012-09-27 13:29:04 -04:00
Chris Dodge
adad3c550b
Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit
2012-09-27 12:31:45 -04:00
David Ormsbee
955e90129a
Merge pull request #771 from MITx/feature/bridger/course_grading
...
Added doc explaining course grading at high level.
2012-09-27 08:39:49 -07:00
Chris Dodge
39e64c1e56
work in progress. Need to commit before rebasing to master
2012-09-27 10:24:53 -04:00
Chris Dodge
7bf7eab616
support client-side caching through 'Last-Modified' response headers
2012-09-27 10:24:53 -04:00
Chris Dodge
7512b78eb2
work-in-flight for uploading/serving of static content for courses
2012-09-27 10:24:53 -04:00
Chris Dodge
85e6c23386
work-in-flight for uploading/serving of static content for courses
2012-09-27 10:24:53 -04:00
Calen Pennington
702c26eafc
Merge pull request #772 from MITx/feature/cale/fix-html-module-editing
...
Feature/cale/fix html module editing
2012-09-27 07:21:16 -07:00
Arjun Singh
81bd0baf08
Fix multiple choice style and multiple choice show answer style
2012-09-27 02:24:01 -07:00
Arjun Singh
3533497b58
Restart server when xmodule css changes (run_watch_data)
2012-09-27 02:23:42 -07:00
arjun810
c8d7fd7849
Merge pull request #777 from MITx/kimth/fix-jquery-sequence
...
Remove vestigial js include
2012-09-26 21:18:51 -07:00
kimth
8210bfdff5
Remove vestigial js include
2012-09-26 19:51:04 -07:00
Lyla Fischer
949f638dd1
added several problem types
2012-09-26 17:31:33 -04:00
Lyla Fischer
3449a74241
merge with master
2012-09-26 16:15:04 -04:00
Lyla Fischer
8dd0feb44a
basic templates for video, html, discussion, and sequential
2012-09-26 16:13:34 -04:00
Lyla Fischer
c1c7d3a1db
added basic problem types
2012-09-26 16:13:16 -04:00
Calen Pennington
2fa122a784
Merge pull request #775 from MITx/hotfix/rocha/404-email-address
...
Fix display of email address on 404 pages
2012-09-26 10:37:26 -07:00
Carlos Andrés Rocha
ed3d944371
Fix display of email address on 404 pages
2012-09-26 13:35:48 -04:00
Calen Pennington
c5b5adeaa9
Merge pull request #774 from MITx/feature/rocha/legal-terms-update
...
Correct Terms of Use and Privacy static pages
2012-09-26 10:25:41 -07:00
Carlos Andrés Rocha
52bde562ce
Correct Terms of Use and Privacy static pages
2012-09-26 13:19:33 -04:00
Calen Pennington
08b7cd8548
Merge pull request #773 from MITx/feature/rocha/legal-terms-update
...
Update Terms of Use and Privacy static pages
2012-09-26 09:01:26 -07:00
Carlos Andrés Rocha
e05c7be1ab
Update Terms of Use and Privacy static pages
2012-09-26 10:42:08 -04:00
ichuang
35569d1086
Merge pull request #731 from MITx/feature/ichuang/symmath_improvements
...
improvements in symbolic math checking.
Merging now because it is needed for Physics courses.
2012-09-25 19:36:02 -07:00
Calen Pennington
7e0b087b97
Remove unused reference to EditingDescriptor
2012-09-25 15:47:12 -04:00
Calen Pennington
7998b4fea6
Fix editing of html modules that broke with changes to EditingDescriptor
2012-09-25 15:46:57 -04:00
Lyla Fischer
3cbb8ed27c
fixed sequence template
2012-09-25 15:16:30 -04:00
Lyla Fischer
5478416a42
fixed lack-of-yaml in html template
2012-09-25 14:02:25 -04:00
Bridger Maxwell
e1652c4790
Added doc explaining course grading at high level.
2012-09-25 13:56:01 -04:00
Lyla Fischer
1aa51a5eb9
basic templates for video, html, discussion, and sequential
2012-09-25 13:47:45 -04:00
David Ormsbee
305dcfc4e9
Put tests to check ordering of scores returned on progress page.
2012-09-25 12:54:06 -04:00
Calen Pennington
d0cfd16bfa
Merge pull request #769 from MITx/feature/rocha/elsevier-press-release
...
Fix news and announcements icons on the frontpage
2012-09-25 07:39:19 -07:00
