1858 Commits

Author	SHA1	Message	Date
Ned Batchelder	27e8d699be	On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.	2013-02-12 13:43:03 -05:00
Brian Wilson	b5378b04b3	change timer to calculate relative duration in javascript	2013-02-12 12:25:11 -05:00
Chris Dodge	33009eba7d	add exporting of grading_policy.json	2013-02-11 14:30:26 -05:00
David Ormsbee	80843c1561	Merge pull request #1463 from MITx/feature/brian/pearson-exam ... Feature/brian/pearson exam	2013-02-08 11:07:15 -08:00
cahrens	98026e4325	A couple minor bug fixes. ... https://edx.lighthouseapp.com/projects/102637/tickets/173 https://edx.lighthouseapp.com/projects/102637/tickets/177	2013-02-08 12:46:32 -05:00
ichuang	7b7b0690b6	fix test_conditional	2013-02-07 18:19:48 -05:00
Brian Wilson	290368ef0d	merge out from master	2013-02-07 17:40:54 -05:00
Brian Wilson	80e4944314	minor cleanup	2013-02-07 16:12:02 -05:00
Brian Wilson	cc11dc2aa3	switch to using timelimit module for Pearson test	2013-02-07 15:57:43 -05:00
Brian Wilson	33a5a5fd9f	add implementation for fixed_time_module	2013-02-07 05:17:56 -05:00
Victor Shnayder	37b735d708	Merge pull request #1454 from MITx/hotfix/dave/youtube_object ... Hack to disable YouTube <iframe> API when they break it.	2013-02-06 19:41:12 -08:00
David Ormsbee	a470a62d12	Hack to disable YouTube <iframe> API when they break it.	2013-02-06 22:37:41 -05:00
Victor Shnayder	edf96036c8	Merge remote-tracking branch 'origin/master' into 7012x-clean	2013-02-06 18:53:14 -05:00
ichuang	b5ba88f0af	Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker ... Conflicts: common/lib/xmodule/xmodule/conditional_module.py	2013-02-06 18:15:36 -05:00
ichuang	c16f688802	conditional xmod: add errortracker msg and inherit icon from child	2013-02-06 18:10:25 -05:00
David Ormsbee	e5fda33eff	Throw the error back up if we don't have a console to log it to.	2013-02-06 17:13:22 -05:00
Vik Paruchuri	463f31618d	Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images	2013-02-06 16:37:52 -05:00
Vik Paruchuri	cf81fb27e8	Add in close date to metadata	2013-02-06 15:55:39 -05:00
Vik Paruchuri	733faebaf0	Fix git issue	2013-02-06 15:28:05 -05:00
Vik Paruchuri	5a51d142bb	Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/tests/test_combined_open_ended.py	2013-02-06 15:26:01 -05:00
Vik Paruchuri	f568e49265	Fix oe version tests	2013-02-06 15:20:02 -05:00
Diana Huang	f42f84d9e8	Merge pull request #1440 from MITx/diana/rubric-ui-improvements ... Rubric UI updates	2013-02-06 11:04:44 -08:00
Diana Huang	f3fa438018	Merge branch 'master' into feature/diana/close-oe-problems ... Conflicts: common/lib/xmodule/xmodule/tests/test_combined_open_ended.py common/lib/xmodule/xmodule/tests/test_self_assessment.py common/lib/xmodule/xmodule/timeparse.py	2013-02-06 13:26:22 -05:00
Vik Paruchuri	f565d17b4f	Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py	2013-02-06 13:23:31 -05:00
Vik Paruchuri	a0febd35a0	Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py	2013-02-06 13:22:12 -05:00
Vik Paruchuri	ddda9ba55d	Try to fix tests	2013-02-06 13:19:37 -05:00
Diana Huang	4adf2f6180	Merge branch 'master' into diana/rubric-ui-improvements ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/combined_open_ended_rubric.py	2013-02-06 13:16:24 -05:00
Vik Paruchuri	96636681e9	Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py	2013-02-06 13:16:02 -05:00
Diana Huang	1f5beba383	Merge branch 'master' into diana/rubric-ui-improvements	2013-02-06 13:12:04 -05:00
Calen Pennington	cfae1cdf62	Pep8 autofixes	2013-02-06 11:13:50 -05:00
Jay Zoldak	fde6d1ba1c	Refactor tests for cms contentstore.	2013-02-06 10:42:21 -05:00
Jay Zoldak	2c5a7ccdf7	Rearrange factories and clean up imports	2013-02-06 10:36:28 -05:00
Diana Huang	f9304a88cb	Remove unneeded error type.	2013-02-06 09:15:24 -05:00
Victor Shnayder	4110a4e28b	Protect against failure to load MathJax ... - e.g. if on a train and don't have access to S3 or the rest of the web	2013-02-05 20:15:47 -05:00
Vik Paruchuri	94e6346cf2	Fix combined open ended tests	2013-02-05 19:04:30 -05:00
Vik Paruchuri	a1e73392c1	Fix descriptor creation	2013-02-05 19:02:21 -05:00
Vik Paruchuri	0fc50095d9	Fix combined open ended tests	2013-02-05 18:53:53 -05:00
Vik Paruchuri	8877ec3500	More robust default version	2013-02-05 18:38:21 -05:00
Vik Paruchuri	4614687e7f	Debug image submissions	2013-02-05 18:24:18 -05:00
Diana Huang	6e7287dd8e	Fix some bugs in the peer grading problem code.	2013-02-05 17:36:06 -05:00
Vik Paruchuri	8bf29c0e1a	Alter image test criteria	2013-02-05 17:17:58 -05:00
Vik Paruchuri	06499bbafc	Fix some of the tests	2013-02-05 17:10:35 -05:00
Vik Paruchuri	1d3f8f0655	Pass display name and content link rewriting down the chain	2013-02-05 16:54:57 -05:00
Vik Paruchuri	8e7fa6c90c	Support due date and display name	2013-02-05 16:48:21 -05:00
Vik Paruchuri	e6770bcaa7	Parse and pass metadata	2013-02-05 16:42:56 -05:00
Vik Paruchuri	3dc05aa904	Make some bug fixes, alter definition passing to work	2013-02-05 16:25:46 -05:00
Diana Huang	51db547a63	Merge branch 'master' into diana/rubric-ui-improvements ... Conflicts: common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee	2013-02-05 16:18:56 -05:00
Vik Paruchuri	ce0b31465c	Add in methods to interact with xmodule, change descriptor	2013-02-05 16:17:55 -05:00
Christina Roberts	8c4b661292	Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote ... studio - resolved HTML display issue with bold and blockquote	2013-02-05 13:13:44 -08:00
Diana Huang	a7588410b2	Fix tests	2013-02-05 16:11:04 -05:00