10188 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Victor Shnayder	9d87710f59	Revert "Lazily loading capa problems (for faster grading)." ... We don't want lazyness, and will save the proper fix (moving work into descriptor load for later)	2012-08-09 10:31:48 -04:00
Calen Pennington	6a21580c21	Merge pull request #372 from MITx/kimth/lms-coderesponse ... New external grader format: JSON-serialized dict	2012-08-09 07:23:34 -07:00
Calen Pennington	42fe35aa63	Merge pull request #368 from MITx/feature/victor/cms-drag-and-drop ... Feature/victor/cms drag and drop	2012-08-09 07:15:18 -07:00
kimth	e3ed383888	Move old externalresponse XML parser into subfunction, fix correctness bug (should be correct/incorrect not True/False)	2012-08-09 09:41:27 -04:00
kimth	58a1248d32	New external grader format: JSON-serialized dict	2012-08-09 08:29:12 -04:00
thomasxiii	f318cbea27	Merge pull request #371 from MITx/feature/kfiedler/courseware-style ... A bunch of minor changes and bug fixes for the courseware	2012-08-08 14:25:13 -07:00
Tom Giannattasio	5c14a1ce65	added admin controls to main post and comments	2012-08-08 16:42:19 -04:00
Kyle Fiedler	971ec9891e	Added new selections styles	2012-08-08 16:27:48 -04:00
Kyle Fiedler	c3cd858e4b	Remove black bars for video	2012-08-08 16:27:48 -04:00
Kyle Fiedler	ccc1f1dfd5	Removed padding and added line-height for the tutorials	2012-08-08 16:27:48 -04:00
Kyle Fiedler	23e52f02c3	Fix odd movement on hover for the next button on hover	2012-08-08 16:27:48 -04:00
Kyle Fiedler	643617599a	Made sequnce nav black and white	2012-08-08 16:27:47 -04:00
Kyle Fiedler	17d072711b	Make the sidebar links more standard, and remove some of their styling	2012-08-08 16:27:47 -04:00
Bridger Maxwell	e4329c312d	Fixed log of error. Xmodules don't have ids, so I log the location instead.	2012-08-08 16:03:28 -04:00
Bridger Maxwell	3930dabdc9	Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading	2012-08-08 16:00:22 -04:00
Calen Pennington	6abc2d733f	Merge pull request #370 from MITx/feature/bridger/django1.4 ... Feature/bridger/django1.4	2012-08-08 12:52:33 -07:00
Bridger Maxwell	9df10c5808	Updated sumbodule to compatible version of askbot.	2012-08-08 15:37:54 -04:00
Mike Chen	f4edc050d0	confirm before deleting comment/thread	2012-08-08 14:57:13 -04:00
Mike Chen	b06e31d2ed	fix Close Thread showing for students and empty bracket in search bar	2012-08-08 14:51:49 -04:00
David Ormsbee	d5dd59bcbb	Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents ... Feature/halogenandtoast/table of contents	2012-08-08 11:45:52 -07:00
Rocky Duan	65f849637f	Merge branch 'ccp0101/moderation' into lol ... Conflicts: lms/urls.py	2012-08-08 14:39:10 -04:00
Rocky Duan	c453885489	Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation	2012-08-08 14:36:31 -04:00
Tom Giannattasio	9b9bb22cda	tightened white space; fixed double margin in comments	2012-08-08 14:36:19 -04:00
Matthew Mongeau	bcdcd7341f	include courseware js	2012-08-08 14:13:34 -04:00
Matthew Mongeau	0b03834f51	XML based table of contents for books.	2012-08-08 14:13:20 -04:00
Calen Pennington	7facb262fc	Remove openid link when feature is disabled. https://www.pivotaltracker.com/story/show/34090805	2012-08-08 14:10:05 -04:00
Bridger Maxwell	7ae0005afd	Fixed CMS setting for 1.4 transition.	2012-08-08 13:30:43 -04:00
Victor Shnayder	523cb334a0	Hook up reordering children in the browser. ... * NOTE: the new order is NOT saved to the server!	2012-08-08 13:15:05 -04:00
Victor Shnayder	77175872cc	Fix some of the CMS jasmine tests. ... * still a few that I haven't tracked down...	2012-08-08 13:14:54 -04:00
Brittany Cheng	3ec658df56	merge tom's styles, warning: LOTS OF STUFF BROKE	2012-08-08 12:45:40 -04:00
Mike Chen	eaf8279451	Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation ... Conflicts: lms/urls.py	2012-08-08 12:04:41 -04:00
Mike Chen	2b803b024e	fix MITx master bug in courseware.	2012-08-08 12:02:50 -04:00
Bridger Maxwell	14a35b9605	Upgrading to django 1.4.	2012-08-08 11:57:15 -04:00
Mike Chen	5e6261ebb1	courseware still not working..	2012-08-08 11:30:11 -04:00
Mike Chen	8627a5f33e	Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation	2012-08-08 11:20:13 -04:00
Tom Giannattasio	dc5b8b51c4	placeholder and button color updates	2012-08-08 11:08:58 -04:00
Calen Pennington	80b8529f2f	Merge branch 'hotfix/1.0.4' ... Conflicts: common/djangoapps/util/middleware.py	2012-08-08 11:05:26 -04:00
Tom Giannattasio	10ff6af3bb	discussion sidebar additions; inline text editor example	2012-08-08 10:56:59 -04:00
Rocky Duan	2e45b8c3c6	Merge branch 'ccp0101/moderation' into lol	2012-08-08 10:46:11 -04:00
Rocky Duan	b1e1cd57d8	Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation	2012-08-08 10:45:04 -04:00
Rocky Duan	18fcdc4be2	Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation	2012-08-08 10:44:24 -04:00
Mike Chen	b2a048e6fc	limit permissions of a role to courses and fix bugs	2012-08-08 10:42:29 -04:00
Bridger Maxwell	696804da13	Changes from pull request comments.	2012-08-08 10:28:40 -04:00
Rocky Duan	c2f27a5f8e	some starting refactor ideas	2012-08-08 10:03:49 -04:00
Calen Pennington	e7bf3d0355	Merge pull request #367 from MITx/arjun/cs188_syllabus_styling ... adding some styling so that the syllabus lists display reasonably	2012-08-08 06:23:38 -07:00
Calen Pennington	ebd0458d6d	Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery ... improve staff_problem_info jquery, so the histogram is also toggled	2012-08-08 05:57:51 -07:00
Arjun Singh	d8a1b5d574	adding some styling so that the syllabus lists display reasonably	2012-08-08 02:59:15 -04:00
Rocky Duan	f1dabe1575	Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol	2012-08-07 18:55:34 -04:00
Rocky Duan	f3d44225cc	Merge branch 'brittany' of github.com:dementrock/mitx into brittany	2012-08-07 18:51:18 -04:00
Rocky Duan	690d97f28b	fixed merge bugs	2012-08-07 18:49:59 -04:00