Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

4251 Commits

Author SHA1 Message Date
cahrens
f77aaec392 Need to mock datetime.datetime.utcnow. 2013-04-03 15:33:51 -04:00
Chris Dodge
5f9d7db94d actually we need to start the draft content export from the sequentials. This is because we need the child pointers to the draft verticals. For private items, if we don't do this, then we'll loose those pointers 2013-04-03 14:43:01 -04:00
Chris Dodge
a023cfa8d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-03 14:14:13 -04:00
Chris Dodge
b640866748 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	common/lib/xmodule/xmodule/x_module.py
 2013-04-03 14:05:59 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
Chris Dodge
1a1635d402 Fix tests and extend export/import unit test with draft testing. 2013-04-03 11:28:25 -04:00
Chris Dodge
b61d7b2c3c Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-03 10:39:06 -04:00
Vasyl Nakvasiuk
c66eabb308 fix caption_asset_path for videoalpha 2013-04-03 11:41:11 +03:00
Victor Shnayder
67fecd3e5e Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes 
Annotation styling fixes
 2013-04-02 18:36:19 -07:00
Chris Dodge
1d8f9c225b Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-02 16:12:05 -04:00
cahrens
f802ac2098 Remove string default value. 2013-04-02 15:21:09 -04:00
Chris Dodge
b8f1b744f2 fix up defaults per Victor's suggestions 2013-04-02 14:26:33 -04:00
Chris Dodge
61b4062689 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint 2013-04-02 14:20:33 -04:00
Chris Dodge
1789814ceb wip 2013-04-02 14:19:54 -04:00
cahrens
42fbc16006 Feedback from code review. 2013-04-02 14:10:56 -04:00
cahrens
ceababbf6d Minor cleanup. 2013-04-02 09:35:26 -04:00
Chris Dodge
3727edabf2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/modulestore/draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/xml_module.py
 2013-04-02 09:09:45 -04:00
Christina Roberts
ebeee7a195 Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata 
list xml_attributes (new field since xblock integration) as system metad...
 2013-04-01 12:24:56 -07:00
Victor Shnayder
ba7d29b3e7 Merge pull request #1763 from MITx/fix/brian/single_section_grading 
modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections
 2013-04-01 11:06:44 -07:00
Calen Pennington
ec06b36660 Merge pull request #1787 from MITx/fix/will/random_seed_not_saved 
Fix/will/random seed not saved
 2013-04-01 10:15:14 -07:00
cahrens
93b0fafea8 Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:41:34 -04:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
Will Daly
fb97602442 Save randomization seed if it is not already set, 
so that the same problem loads when the user
checks/saves/resets
 2013-04-01 12:08:53 -04:00
Will Daly
7f00487203 Reverted last commit due to concerns about database writes. 2013-04-01 11:48:10 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Calen Pennington
0e4369603e Merge pull request #1756 from MITx/fix/vik/oe-and-progress 
Fix/vik/oe and progress
 2013-04-01 08:31:58 -07:00
Chris Dodge
dc17e93339 per Victor, one shouldn't change the default parameter to a function, since that change is global to the entire lifetime. 2013-04-01 11:31:25 -04:00
Will Daly
b76adb4b06 Updated tests to address on-going randomization bug. 
Capa problem state was not being copied to module state
during module initialization.
This meant that when check_problem was called the first time,
the seed would be re-generated and saved.
 2013-04-01 11:22:42 -04:00
Chris Dodge
ef267d9b89 list xml_attributes (new field since xblock integration) as system metadata which should not be edited in Studio 2013-04-01 11:11:30 -04:00
Victor Shnayder
9c4a88b570 Merge pull request #1743 from MITx/fix/will/bug_288 
Fix/will/bug 288
 2013-04-01 07:22:20 -07:00
Will Daly
4322b83894 Added additional comments 2013-04-01 09:02:04 -04:00
Will Daly
f90e29ce96 Fixed a test error that occurred because the problem 
was not set to done before resetting it.
To avoid to small chance that we'll get the same seed when
we reset, try to get a new seed multiple times.
 2013-04-01 08:55:06 -04:00
ichuang
f1cc6e8597 fix psychoanalyze - make compatible with xblock 2013-03-31 12:40:43 +00:00
ichuang
b3f00a6725 add default message to conditional 2013-03-31 12:31:05 +00:00
Don Mitchell
c655c814e8 Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint 
add checking for metadata that we can't support editing for in Studio. T...
 2013-03-29 12:38:42 -07:00
Don Mitchell
80f57db7c3 Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf 
Feature/cdodge/course overview perf
 2013-03-29 12:35:41 -07:00
Chris Dodge
599ca4d429 oops. I'm not programming in C# any longer 2013-03-29 15:31:37 -04:00
Chris Dodge
3ce01882bb add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials 2013-03-29 13:59:59 -04:00
Diana Huang
17adc986bd Remove the default and prevent input_state from keeping around 
unnecessary data.
 2013-03-29 12:16:27 -04:00
Will Daly
4f9d18df8c Wrote unit tests to verify bug fix in 
https://github.com/MITx/mitx/pull/1764
 2013-03-29 12:00:17 -04:00
Vik Paruchuri
d5376e71ff Add in a test for the weight field 2013-03-29 11:46:44 -04:00
Vik Paruchuri
5391cefddc Add in tests to see if max score properly exposed and calculated in combinedopenended 2013-03-29 11:17:35 -04:00
Vik Paruchuri
53620d7879 Merge remote-tracking branch 'origin/master' into fix/vik/oe-and-progress 2013-03-29 10:16:00 -04:00
Brian Wilson
39d666cd13 modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections 2013-03-29 01:27:36 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 13:27:29 -04:00
Chris Dodge
c55d54b071 also, we don't support metadata on chapters 2013-03-28 13:03:34 -04:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Chris Dodge
c7bafddace DRY things out a bit and share as much code between MongoModuleStore and DraftMongoModuleStore 2013-03-28 09:49:55 -04:00
Chris Dodge
3cdd973af4 get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore 2013-03-28 09:28:19 -04:00
Chris Dodge
6c67ed1f57 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 09:28:12 -04:00