Calen Pennington
a74dfdb2e7
Remove circular dependencies that connect student.models and django_comment_client
2013-01-10 15:19:38 -05:00
Calen Pennington
941d55cee3
Merge pull request #1229 from MITx/feature/ichuang/update-symmath-server
...
Feature/ichuang/update symmath server
2013-01-09 06:10:32 -08:00
Calen Pennington
5a95dd28b1
Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc
...
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-09 06:08:45 -08:00
David Ormsbee
ecb3dd6134
Merge pull request #1239 from MITx/bugfix/dave/forum_missing_vertical
...
Fix parent lookups when the same named tag exists in multiple courses
2013-01-08 13:38:23 -08:00
David Ormsbee
1122cdb286
Added more comments in response to code review.
2013-01-08 16:37:31 -05:00
David Ormsbee
051339afb0
Tiny cleanup.
2013-01-08 13:54:44 -05:00
David Ormsbee
8952eda98d
XML loaded courses should no longer be able to throw NoPathToItem.
...
The parent trees are built on a per-course basis (so it'll throw ItemNotFoundError
if an item exists in a different course from the one you're asking after. NoPathToItem
can still happen with MongoDB backed courseware. They store things like the info page
as HTML snippets which are orphaned from other content.
2013-01-08 13:45:13 -05:00
David Ormsbee
fc0a7614bf
Load courses in dir name order, keep separate ParentTracker per course.
2013-01-08 13:38:22 -05:00
Victor Shnayder
1db70050ff
Merge pull request #1235 from MITx/fix/zoldak/clarify-doc
...
Clarify the syntax of the rake fasttest command
2013-01-07 12:29:11 -08:00
Jay Zoldak
d3fd6ac151
Clarify the syntax of the rake fasttest command
2013-01-07 15:23:08 -05:00
Victor Shnayder
e428e9cb2a
Merge pull request #1234 from MITx/fix/zoldak/clarify-doc
...
Clarify that you need to start up the mongo daemon
2013-01-07 11:19:27 -08:00
Jay Zoldak
0c6e8c4820
Clarify that you need to start up the mongo daemon
2013-01-07 14:08:18 -05:00
Carlos Andrés Rocha
60f5089941
Merge pull request #1231 from MITx/content/rocha/job-page-update
...
Fix typos in job and faq pages
2013-01-07 07:31:48 -08:00
Carlos Andrés Rocha
56f1c6aad9
Fixed extra characters in faq page
2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256
Fix typo in the job page
...
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org >
2013-01-07 10:08:16 -05:00
ichuang
9a0d85667c
symmath use https, no server cert verify
2013-01-05 12:29:03 -05:00
ichuang
bf3669395b
update symmath snuggletex server
2013-01-05 12:29:00 -05:00
Carlos Andrés Rocha
d0221808db
Merge pull request #1228 from MITx/content/rocha/media-kit
...
Add new tab/window behavior to media kit
2013-01-04 07:07:43 -08:00
Brian Talbot
04524ef58f
media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text
2013-01-04 10:02:14 -05:00
ichuang
c555bf5a8d
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-03 22:57:24 -05:00
Carlos Andrés Rocha
95e7f2f1eb
Merge pull request #1226 from MITx/content/rocha/media-kit
...
Fix error in one of the media kit assets URLs
2013-01-03 15:30:08 -08:00
Carlos Andrés Rocha
59f4962cfa
Fix error in one of the media kit assets URLs
2013-01-03 18:29:34 -05:00
Carlos Andrés Rocha
c3d7bbe0e0
Merge pull request #1225 from MITx/content/rocha/media-kit
...
Minor style changes to home page and media kit page
[Finishes #41872203 ]
2013-01-03 15:07:55 -08:00
Carlos Andrés Rocha
25cb6d5a22
Minor style changes to home page and media kit page
...
[#41872203 ]
2013-01-03 18:06:22 -05:00
David Ormsbee
67dea0c3c3
Merge pull request #1224 from MITx/content/rocha/media-kit
...
Add media kit page
2013-01-03 14:50:57 -08:00
Carlos Andrés Rocha
2e6ac2f72c
Fix link to root page on the main page footer
2013-01-03 17:21:54 -05:00
Brian Talbot
a67b54bf82
media kit - added initial styles to media kit page
2013-01-03 17:10:16 -05:00
Brian Talbot
e10e87e6ec
media kit - revised link styling on homepage
2013-01-03 14:21:07 -05:00
Carlos Andrés Rocha
bd0a2f6630
Add content and assets for media kit
...
[# 41872203]
2013-01-03 13:28:45 -05:00
David Ormsbee
559bf8874a
Merge pull request #1132 from MITx/vik/modify_open_ended
...
Vik/modify open ended
2013-01-03 10:00:31 -08:00
Calen Pennington
ecd2304cc9
Merge pull request #1223 from MITx/fix/zoldak/lms-acceptance-testing
...
Add splinter to test-requirements.txt
2013-01-03 09:51:21 -08:00
Jay Zoldak
fd902165c0
Add splinter to test-requirements.txt
2013-01-03 12:34:54 -05:00
Vik Paruchuri
90d902d105
Fix file version
2013-01-03 12:11:27 -05:00
Vik Paruchuri
1af35582fd
Merge branch 'master' into vik/modify_open_ended
2013-01-03 12:08:51 -05:00
David Ormsbee
2daddff2ef
Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
...
Merge the lettuce acceptance test framework to master
2013-01-03 09:06:47 -08:00
Vik Paruchuri
b01666f6d6
Fix error messages
2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67
Pass through initial display and answer
2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c
More descriptive error message
2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103
Fixes to log entire state on errors, format feedback better
2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8
Handle unicode feedback
2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b
Display max score as well as score
2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426
Patch "correct" answer display
2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d
Change names
2013-01-03 11:50:57 -05:00
Vik Paruchuri
5caa42fbe3
Reset some files
2013-01-03 11:50:57 -05:00
Vik Paruchuri
11c330bf52
Fix rebase issues
2013-01-03 11:50:22 -05:00
Vik Paruchuri
2c469cad75
Wire in submit message
2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420
Add in message passing pipeline
2013-01-03 11:47:41 -05:00
David Ormsbee
86247139a9
Merge pull request #1129 from MITx/valera/require-js
...
Inclusion of namespaced Require JS
2013-01-03 08:44:30 -08:00
Diana Huang
09ed3d12a2
Hook up the backend into the new feedback response for scores
2013-01-03 11:40:41 -05:00
Diana Huang
c87d0f11d6
Show error when no score selected
2013-01-03 11:40:41 -05:00
