4583 Commits

Author	SHA1	Message	Date
ichuang	857a6e0bd0	pylint masquerade fixes	2013-04-13 22:47:28 -04:00
ichuang	fdfc37e4e3	masquerade pep8	2013-04-13 22:47:21 -04:00
ichuang	af3e08e8c7	masquerade link in courseware/views.py	2013-04-13 22:47:15 -04:00
ichuang	168a3aadf6	masquerade - remove debug line, careful with ifs in course_nav.html	2013-04-13 22:46:55 -04:00
ichuang	fb0a23238a	allow staff to masquerade as student - works ... Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/course_navigation.html	2013-04-13 22:46:39 -04:00
ichuang	c905cc7416	add masquerade.py	2013-04-13 22:46:30 -04:00
Jay Zoldak	d8c186d3a1	fix pylint errors in test_login.py	2013-04-12 10:25:12 -04:00
Jay Zoldak	1cc6a0a60d	Fix pylint errors	2013-04-11 17:20:38 -04:00
Jay Zoldak	bb1134b8ee	Convert login tests to use factories	2013-04-11 16:54:16 -04:00
cahrens	f0d2ff7ba4	Change display_timezone to show_timezone.	2013-04-08 09:11:10 -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
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	57343c7d9e	On course about page, display course end date if no about page HTML blog (end_date.html) exists. ... #224	2013-04-04 15:35:07 -04: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
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	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
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
ichuang	025c5df16e	fix IntegrityError duplicate entry issue with module_data Scope.student_state update	2013-04-01 21:51:45 +00:00
Brian Wilson	1abfff220e	when grading, check for always-regrade at the section level too	2013-04-01 14:14:12 -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	15d1bc372d	clean up xqueue callback url generation; allow override from settings	2013-03-31 19:40:39 +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
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
Will Daly	9c671163fd	Added exc_info=True to log.warning ... Changed log.exception to log.warning	2013-03-27 17:11:02 -04:00