Vik Paruchuri
418c45f4d3
Bugfixes
2013-01-10 18:59:57 -05:00
Vik Paruchuri
beef00c13a
Json instance state fix
2013-01-10 18:59:57 -05:00
Vik Paruchuri
b8d49511e1
Fixing javascript display bugs
2013-01-10 18:59:57 -05:00
Vik Paruchuri
36c55d347b
Combined JS
2013-01-10 18:59:57 -05:00
Vik Paruchuri
dc0a798941
Javascript fixes to remove reset button from self assessment
2013-01-10 18:59:57 -05:00
Vik Paruchuri
8ca12ce500
Make combined open ended a container
2013-01-10 18:59:57 -05:00
Vik Paruchuri
8e03c8f655
Fix missing comma issue
2013-01-10 18:59:57 -05:00
Vik Paruchuri
cac5b75cf4
Change modules
2013-01-10 18:59:57 -05:00
Vik Paruchuri
bc6838f8da
Minor changes
2013-01-10 18:59:57 -05:00
Vik Paruchuri
4ea9c738a3
Fix state transitions
2013-01-10 18:59:57 -05:00
Vik Paruchuri
ae0623ab9b
Working on transitions between states
2013-01-10 18:59:57 -05:00
Vik Paruchuri
2bbbe12ae8
Refactor instance state saving
2013-01-10 18:59:57 -05:00
Vik Paruchuri
b009d15dcc
Self assessment wrapped into another module now works
2013-01-10 18:59:57 -05:00
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
Brian Wilson
ae641e4dee
Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg
2013-01-10 18:32:05 -05:00
Brian Wilson
7d279efd0e
add functionality for exporting EAD files to Pearson (and add dump_all option to CDD-dumping).
2013-01-10 18:31:41 -05:00
Diana Huang
4257a0230a
Merge branch 'master' into feature/diana/rubric-input
2013-01-10 17:57:07 -05:00
Brian Talbot
759bb137b4
pearson registration - adjusted style for rejected message state on dashboard
2013-01-10 17:08:01 -05:00
Don Mitchell
495814c01a
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 17:00:13 -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
Don Mitchell
5205ada498
Merge pull request #1261 from MITx/fix/zoldak/studio-toggle-bdd-tests
...
Add BDD lettuce tests for studio overview toggle section feature.
2013-01-10 13:52:55 -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
Don Mitchell
c289575b49
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 16:40:32 -05:00
Don Mitchell
fa2a243068
Explanation markup
2013-01-10 16:40:05 -05:00
Jay Zoldak
64e8f9c0cd
Add BDD lettuce tests for studio overview toggle section feature.
2013-01-10 16:00:40 -05: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
Calen Pennington
a74dfdb2e7
Remove circular dependencies that connect student.models and django_comment_client
2013-01-10 15:19:38 -05:00
Brian Wilson
83fdab79ba
pearson_make_tc_user: add support for incremental changes, and changes to 'internal' fields for debugging.
2013-01-10 15:16:13 -05:00
Diana Huang
0bfb1feed4
Log better exceptions
2013-01-10 15:06:16 -05:00
cahrens
221ac49332
Version 3.5.8 of tinyMCE. http://www.tinymce.com/
2013-01-10 15:00:30 -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
cahrens
6adffc64d4
Delete old version of tiny_mce.
2013-01-10 14:51:22 -05:00
Don Mitchell
c74605abf0
Merge pull request #1258 from MITx/fix/cdodge/export-create-recursive-folders
...
the parent directory might not already exist, so we have to call makedir...
2013-01-10 11:46:21 -08:00
Chris Dodge
dc8f23d6ae
the parent directory might not already exist, so we have to call makedir with recursive=true to auto-create any parent folders
2013-01-10 14:41:19 -05:00
cahrens
a5f98a7590
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-10 14:31:32 -05:00
Calen Pennington
cb3b17d44c
Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior
2013-01-10 14:30:12 -05:00
