Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,355 Commits 1 Branch 0 Tags
81f94fc4e2cb2b2c2dffb8c23728db596b98c1dc
Commit Graph

2621 Commits

Author SHA1 Message Date
Sarina
74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress 
Fix weighting and score generation
 2013-04-08 14:37:07 -07:00
Vik Paruchuri
7d09617ec9 Fix weighting and score generation 2013-04-08 16:52:18 -04:00
Chris Dodge
54afc5eb63 seems like we need to purge 'filename' from both _model_data as well as xml_attributes 2013-04-08 16:09:41 -04:00
Chris Dodge
a0f5a51135 wip to fix broken test 2013-04-08 15:34:12 -04:00
Chris Dodge
0b26cc2635 fix line breaks per Cale 2013-04-08 14:48:16 -04:00
Chris Dodge
069f997595 import was putting the xml data into definition.data.data rather than definition.data 2013-04-08 14:33:46 -04:00
chrisndodge
9a405ff44c Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through 
extend the list of container module names to our comuputation of inherit...
 2013-04-08 11:11:14 -07:00
Chris Dodge
7cd4310c32 extend the list of container module names to our comuputation of inherited metadata 2013-04-08 12:12:23 -04:00
chrisndodge
a57e0fa2c5 Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl 
make "edit" links work - fixes giturl (was broken by xblocks migration)
 2013-04-08 08:17:31 -07:00
Don Mitchell
c6bec6bcad Merge pull request #1812 from MITx/feature/christina/gmt 
Display UTC on the end of dates (that are in UTC).
 2013-04-08 07:00:08 -07:00
cahrens
c4befa136f pep8 2013-04-08 09:15:07 -04:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00
Chris Dodge
93e27c5f0c remove unsed import 2013-04-08 09:09:51 -04:00
Chris Dodge
9e2409743f remove unsed import 2013-04-08 09:09:35 -04:00
Chris Dodge
052fc5ad11 revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work 2013-04-08 09:08:51 -04:00
cahrens
2631452b9c Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:46:07 -04:00
cahrens
e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:38:52 -04:00
Chris Dodge
288620592a get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish 2013-04-07 19:33:04 -04:00
ichuang
8cafadc03b make "edit" links work - fixes giturl (was broken by xblocks migration) 
Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py
 2013-04-07 00:03:36 +00:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Sarina
aca6cdbade Merge pull request #1813 from MITx/fix/vik/pg-progress 
Fix pg progress
 2013-04-05 09:51:13 -07:00
vik
6aada791d8 Fix pg progress 2013-04-05 11:58:16 -04:00
chrisndodge
f467d93f97 Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course 
Feature/cdodge/integrity check mongo course
 2013-04-05 06:52:42 -07:00
Chris Dodge
8e36197cc2 tweeks per Cale's feedback 2013-04-05 09:30:49 -04:00
cahrens
49e0753ef5 Show GMT time, 24-hour. 2013-04-04 16:56:10 -04:00
Calen Pennington
9075e84430 Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg 
add default message to conditional
 2013-04-04 13:39:19 -07:00
Christina Roberts
de44813732 Merge pull request #1808 from MITx/bug/christina/studio 
Show course end date on course about page
 2013-04-04 13:34:00 -07:00
cahrens
d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:22:56 -04:00
Diana Huang
42614c69b4 Add space after comma. 2013-04-04 14:16:38 -04:00
Diana Huang
02b7ab4fa0 Tests to make sure that input_states have the correct keys 
and are not cross-pollinating
 2013-04-04 13:47:55 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -04:00
Chris Dodge
ac01079502 add a command line utility to walk through the course and find common errors 2013-04-04 09:35:35 -04:00
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix 
fix psychometrics to be compatible with new xblocks
 2013-04-04 05:50:59 -07:00
cahrens
f77aaec392 Need to mock datetime.datetime.utcnow. 2013-04-03 15:33:51 -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
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
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
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
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