Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

2954 Commits

Author SHA1 Message Date
Calen Pennington
e5a6509bb0 Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule 2013-01-23 14:47:05 -05:00
Calen Pennington
ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed 2013-01-23 14:47:05 -05:00
Calen Pennington
9d66169d06 Don't set a seed to None that's already None 2013-01-23 14:47:05 -05:00
Calen Pennington
8e5373f993 Make Randomization return un-adjusted values as a passthrough 2013-01-23 14:47:05 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
cahrens
13945994f0 change class on right element! 2013-01-22 15:47:09 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Ned Batchelder
532285e558 Only need one of these lines. 2013-01-22 15:22:30 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Diana Huang
24f23176af Add the ability to set up custom text for short form and 
and long form results.
 2013-01-22 13:17:37 -05:00
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -05:00
Diana Huang
a34a9dd038 Merge branch 'master' into diana/open-ended-ui-updates 2013-01-22 08:40:40 -05:00
Diana Huang
e7bc32fd4d Merge branch 'master' into feature/diana/rubric-input 2013-01-22 08:38:17 -05:00
Valera Rozuvan
757f955c5e Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course. 2013-01-21 15:53:44 +02:00
Alexander Kryklia
5200534a4a template for drag_and_drop capaproblem 2013-01-21 15:52:49 +02:00
Carlos Andrés Rocha
84efafc896 Add missing semicolon at the end of sequence display module javascript 2013-01-18 17:00:51 -05:00
Diana Huang
c7421f040b Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:45:36 -05:00
Diana Huang
ef53bab5dd One more fix 2013-01-18 16:41:00 -05:00
Diana Huang
6ab7afac4a One more merge fix 2013-01-18 16:37:47 -05:00
Diana Huang
dd20226ec3 Merge branch 'master' into feature/diana/rubric-input 
Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:36:22 -05:00
Diana Huang
8cdc118a1d Typo fix 2013-01-18 16:26:47 -05:00
Diana Huang
e04f2f984a Update tests for new behavior 2013-01-18 16:18:33 -05:00
Diana Huang
2291483c43 Merge branch 'master' into diana/open-ended-ui-updates 2013-01-18 16:16:21 -05:00
Chris Dodge
0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-18 16:14:27 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-01-18 15:44:41 -05:00
Chris Dodge
39101c76a5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 2013-01-18 15:43:45 -05:00
Diana Huang
89055da8ba Take out useless logging. 2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041 Merge branch 'master' into diana/fix-sa-tests 2013-01-18 15:21:50 -05:00
Diana Huang
bd6d153126 Fix failing self-assessment unit tests 2013-01-18 15:18:13 -05:00
Diana Huang
f500958439 More fixes for the merge and some display updates. 2013-01-18 13:52:50 -05:00
cahrens
700b0f14fd Need path to tiny mce JS file now. 2013-01-18 10:48:42 -05:00
Chris Dodge
575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 
Conflicts:
	jenkins/test.sh
 2013-01-18 10:26:44 -05:00
Brian Talbot
d2f79f10f0 studio - synced LMS common content styles with HTML component display/edit rendering styles 2013-01-18 09:59:08 -05:00
Diana Huang
2e791043e8 Merge branch 'master' into diana/open-ended-ui-updates 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 09:21:38 -05:00
Diana Huang
481580c702 Remove hints from self-assessment and misc display fixes 2013-01-18 08:48:50 -05:00
chrisndodge
031e79ec24 Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes 
only cache discussion forum info for 5 minutes before flushing. This is ...
 2013-01-17 20:59:27 -08:00
Chris Dodge
c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata 2013-01-17 23:58:07 -05:00