Vik Paruchuri
517c79e00a
Fixing state tracking
2013-01-10 18:59:57 -05:00
Vik Paruchuri
cd764d3d7c
Modify self-assessment to not be an xmodule
2013-01-10 18:59:57 -05:00
Vik Paruchuri
e975174d66
Convert self-assessment away from xmodule
2013-01-10 18:59:57 -05:00
Vik Paruchuri
4047106e48
Some progress with rendering
2013-01-10 18:59:57 -05:00
Vik Paruchuri
867deae6e3
Bugfixes
2013-01-10 18:59:57 -05:00
Vik Paruchuri
0be51cfa2d
Xmodule combined now working
2013-01-10 18:59:57 -05:00
Vik Paruchuri
e0d12bcbfe
Add in some descriptions
2013-01-10 18:59:57 -05:00
Vik Paruchuri
5858ec5e0d
Begin making integrated module
2013-01-10 18:59:57 -05:00
Vik Paruchuri
60f9143fa5
Minor change
2013-01-10 18:59:57 -05:00
Victor Shnayder
e97469aee6
Merge pull request #1236 from MITx/diana/peer-grading-views
...
Peer Grading Interface
2013-01-10 13:59:46 -08:00
Diana Huang
5bdf91e812
Merge branch 'diana/peer-grading-improvements' into diana/peer-grading-views
2013-01-10 16:50:18 -05:00
Diana Huang
7fcfe0359d
Merge branch 'master' into diana/peer-grading-views
2013-01-10 16:47:50 -05:00
Diana Huang
d0e00af60e
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 16:45:40 -05:00
Diana Huang
81bb2dc979
Better and clearer comments along with some fixes
...
for code review issues
2013-01-10 16:45:19 -05:00
David Ormsbee
232393b4f1
Merge pull request #1259 from MITx/feature/rocha/add-is_new-flag-to-courses
...
Add property to course module to check if a course is new
2013-01-10 13:40:48 -08:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Diana Huang
ef6d77b116
Clean up names and refactor out some common logic
2013-01-10 15:33:17 -05:00
Diana Huang
084a3c33c8
Update comments and remove some unnecessary code
2013-01-10 15:20:46 -05:00
Diana Huang
0bfb1feed4
Log better exceptions
2013-01-10 15:06:16 -05:00
Diana Huang
4909b84966
Clean up code and make the arguments for get and post more logical.
2013-01-10 14:51:32 -05:00
Diana Huang
3a29d260ae
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 14:12:06 -05:00
Diana Huang
19bc657487
Use correct version of the grader id.
2013-01-10 12:44:54 -05:00
Diana Huang
393ee3533c
Merge branch 'master' into diana/peer-grading-improvements
2013-01-09 15:45:02 -05:00
Diana Huang
13c692c29b
Show back button when we see an error.
2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05:00
Diana Huang
950d398387
Updates to the CSS
2013-01-09 10:19:42 -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
Diana Huang
f0f25296b2
Update documentation
2013-01-08 15:54:49 -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
Diana Huang
19401f29d9
Minor javascript updates
2013-01-08 10:22:07 -05:00
Diana Huang
3f254fc3c7
Merge branch 'master' into diana/peer-grading-views
2013-01-07 15:57:39 -05:00
Diana Huang
02247172a2
Fix some interstitial page CSS
2013-01-07 15:55:14 -05:00
Diana Huang
bbc5cd50bc
Add in default value for MOCK_PEER_GRADING
2013-01-07 15:49:48 -05:00
Diana Huang
b7473f8017
Make mock service return useful data
2013-01-07 15:40:01 -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
Diana Huang
e1ec4eec71
Get tests to pass by creating a mock peer grading service
2013-01-07 14:46:32 -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
Diana Huang
2293a37f7d
Move over old Staff Grading tests to new app.
2013-01-07 09:17:09 -05:00
ichuang
9a0d85667c
symmath use https, no server cert verify
2013-01-05 12:29:03 -05:00
