1740 Commits

Author	SHA1	Message	Date
Calen Pennington	99424a9716	Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error ... fix IntegrityError duplicate entry issue with module_data Scope.student_state update	2013-04-04 11:57:59 -07:00
Calen Pennington	e97e8ce5b6	Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup ... clean up xqueue callback url generation; allow override from settings	2013-04-04 11:54:13 -07:00
Calen Pennington	ff8dca943c	Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix ... fix lms migration to be compatible with xblock	2013-04-04 11:17:38 -07:00
Calen Pennington	72ce1af982	Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands ... fix forum management commands (assign_default_role was moved)	2013-04-04 10:14:31 -07:00
Calen Pennington	7f19d48985	Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock ... Migrate to the open source XBlock repo	2013-04-04 10:12:00 -07:00
Brian Wilson	d3e7739b3b	add user name and email to progress page	2013-04-04 12:03:08 -04:00
Brian Wilson	4c511c3c66	add progress logging	2013-04-04 11:14:52 -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
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
Don Mitchell	9a7324ebfa	Merge pull request #1798 from MITx/bug/christina/studio ... Fix due date bug.	2013-04-03 10:26:40 -07:00
brianhw	7c9875870b	Merge pull request #1770 from MITx/fix/brian/remove-input_state ... management command to remove excess input_state entries	2013-04-03 07:35:47 -07:00
Brian Wilson	b11f0e17f7	respond to feedback	2013-04-03 10:22:43 -04:00
Brian Wilson	b6f95c71ce	change command to handle file input instead	2013-04-02 16:20:46 -04:00
Victor Shnayder	c5869c76b6	Merge pull request #1782 from MITx/feature/ichuang/allow-reset-of-openended-problems ... allow student state of module other than problem to be reset by instructor	2013-04-01 15:11:59 -07:00
ichuang	025c5df16e	fix IntegrityError duplicate entry issue with module_data Scope.student_state update	2013-04-01 21:51:45 +00:00
jarv	b7fba98e2a	Merge pull request #1790 from MITx/fix/cdodge/certificates-db-perf-optimization ... optimize db round trips, by getting the course descriptor outside of the...	2013-04-01 11:26:29 -07:00
Victor Shnayder	140ad8bf61	Merge pull request #1791 from MITx/fix/brian/foldit-grading ... when grading, check for always-regrade at the section level too	2013-04-01 11:18:58 -07:00
Brian Wilson	1abfff220e	when grading, check for always-regrade at the section level too	2013-04-01 14:14:12 -04: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
Chris Dodge	8fef830740	optimize db round trips, by getting the course descriptor outside of the user loop	2013-04-01 14:02:54 -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
cahrens	16f4a3f9c1	Convert due date to a Date (vs. a string with no year).	2013-04-01 11:37:05 -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
ichuang	cac7f8a289	allow student state of module other than problem to be reset by instructor ... this makes it possible to reset open ended response problems	2013-03-31 19:43:39 +00:00
ichuang	15d1bc372d	clean up xqueue callback url generation; allow override from settings	2013-03-31 19:40:39 +00:00
ichuang	febcb51133	make psychometrics curve fitting more robust	2013-03-31 12:52:29 +00:00
ichuang	26f14aaf6d	fix psychoanalyze (compatibility with new xblock)	2013-03-31 12:41:12 +00:00
ichuang	f1cc6e8597	fix psychoanalyze - make compatible with xblock	2013-03-31 12:40:43 +00:00
ichuang	14899b9066	fix lms migration to be compatible with xblock	2013-03-31 12:35:08 +00:00
Brian Wilson	23d96b2533	change submission history to be ordered by id	2013-03-29 21:16:20 -04:00
Brian Wilson	29731ec40b	management command to remove excess input_state entries	2013-03-29 15:20:34 -04:00
Jay Zoldak	a5b1428bba	Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests ... Feature/will/speed up unit tests	2013-03-29 10:53:10 -07:00
Jay Zoldak	d044d5c48d	a few more pep8 fixes	2013-03-29 13:15:33 -04:00
Brian Wilson	50fd7ee7a4	fix test	2013-03-29 12:01:10 -04:00
Jay Zoldak	b63aae221e	small pep8 pylint and superclass fixes	2013-03-29 10:41:27 -04:00
Will Daly	5bf839c9a9	Guard against trying to load a template when checking pages.	2013-03-28 16:55:20 -04:00
Ned Batchelder	252f9364a6	Merge pull request #1761 from MITx/content/rocha/utaustinx-courses ... Content/rocha/utaustinx courses	2013-03-28 10:26:02 -07:00
Carlos Andrés Rocha	4050da6b4c	Enable meta-universities (organizations that contain other)	2013-03-28 13:23:50 -04:00
Will Daly	f652fb5f73	Pylint and pep8 fixes	2013-03-28 12:51:09 -04:00
Jay Zoldak	c9a7be6b9b	Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers ... Feature/will/lettuce test helpers	2013-03-28 07:26:14 -07:00
Will Daly	13c01ec3fc	Randomized instructor page tests	2013-03-28 10:03:05 -04:00
Will Daly	bf37d4a9a3	Randomized loading of test pages for dark launch test	2013-03-28 09:33:51 -04:00
Will Daly	c48f119cec	Skip test of mock_xqueue_server	2013-03-28 09:13:28 -04:00
Will Daly	3eefb7d5ec	Resolved conflicts from rebase to master; fixed keyword error caught by ... pylint	2013-03-28 08:58:56 -04:00
Will Daly	27a31230bf	Removed full course tests	2013-03-28 08:55:45 -04:00
Will Daly	7978c581db	Changed test for checking all pages to checking a random page	2013-03-28 08:55:16 -04:00
Brian Wilson	c639799a07	fix missing import	2013-03-27 18:12:48 -04:00
Brian Wilson	bb7bc88847	merge out from master	2013-03-27 18:04:58 -04:00
Brian Wilson	99778b1b5b	add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.	2013-03-27 17:59:56 -04:00